Changeset 850

Timestamp:

09/17/07 18:26:25 (15 months ago)

Author:

freakerz

Message:

Themes::get_all() used to work only on the first call.

Once self::$all_themes was set, it would try to work with $themes, which was not set prior.

Now all it does is if it exists, return it, kthxbye.

Files:

• trunk/htdocs/system/classes/themes.php (modified) (2 diffs)

trunk/htdocs/system/classes/themes.php

@@ -14 +14 @@
     public static function get_all()
     {
-        if ( ! isset( self::$all_themes )) {
+        if ( !isset( self::$all_themes ) ) {
             $themes= glob( HABARI_PATH . '/user/themes/*', GLOB_ONLYDIR | GLOB_MARK );
             if( Site::is('multi') ) {
@@ -22 +22 @@
                 }
             }
+            $themes= array_filter( $themes, create_function('$a', 'return file_exists($a . "/theme.xml");') );
+            $themefiles= array_map('basename', $themes);
+            self::$all_themes= array_combine($themefiles, $themes);
         }
-        $themes= array_filter( $themes, create_function('$a', 'return file_exists($a . "/theme.xml");') );
-        $themefiles= array_map('basename', $themes);
-        self::$all_themes= array_combine($themefiles, $themes);
         return self::$all_themes;
     }