From d829235701564b0e45802bae9eac274882cec9c2 Mon Sep 17 00:00:00 2001
From: "Duck (Jakob Munih)" <duck@obala.net>
Date: Sun, 8 Mar 2009 12:38:40 +0100
Subject: [PATCH] Fix prefs warnings

---
 folks/lib/Folks.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/folks/lib/Folks.php b/folks/lib/Folks.php
index 03f3bb686..5adfbbccb 100644
--- a/folks/lib/Folks.php
+++ b/folks/lib/Folks.php
@@ -44,13 +44,12 @@ class Folks {
      */
     static function getCountries()
     {
-        if (file_exists(FOLKS_BASE . '/config/countries.php')) {
-            $countries = Horde::loadConfiguration('countries.php', 'countries', 'folks');
-        } else {
-            $countries = NLS::getCountryISO();
+        $result = Horde::loadConfiguration('countries.php', 'countries', 'folks');
+        if ($result instanceof PEAR_Error) {
+            return NLS::getCountryISO();
         }
 
-        return $countries;
+        return $result;
     }
 
     /**
-- 
2.11.0