PHP 5 style for static vars.

diff --git a/imp/lib/Search.php b/imp/lib/Search.php
index 4363296..97a871e 100644 (file)
--- a/imp/lib/Search.php
+++ b/imp/lib/Search.php
@@ -67,6 +67,13 @@ class IMP_Search
     protected $_saveVFolder = true;
 
     /**
+     * The list of Virtual Folders obtained from the prefs.
+     *
+     * @var array
+     */
+    static protected $_vfolder;
+
+    /**
      * Constructor.
      *
      * @param array $params  Available parameters:
@@ -275,25 +282,23 @@ class IMP_Search
      */
     protected function _getVFolderList()
     {
-        static $vfolder;
-
-        if (isset($vfolder)) {
-            return $vfolder;
+        if (isset(self::$_vfolder)) {
+            return self::$_vfolder;
         }
 
         $vfolder = $GLOBALS['prefs']->getValue('vfolder');
-        if (empty($vfolder)) {
-            return array();
+        if (!empty($vfolder)) {
+            $old_error = error_reporting(0);
+            $vfolder = unserialize($vfolder);
+            error_reporting($old_error);
         }
 
-        $old_error = error_reporting(0);
-        $vfolder = unserialize($vfolder);
-        error_reporting($old_error);
-
-        if (!is_array($vfolder)) {
+        if (empty($vfolder) || !is_array($vfolder)) {
             $vfolder = array();
         }
 
+        self::$_vfolder = $vfolder;
+
         return $vfolder;
     }