From 5e6c8894e23239f2f34f3fb99ab76f43cbabe838 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 9 Jun 2009 20:08:48 -0700
Subject: Use a reference in available() to avoid crappy looking dereferencing.

---
 modules/gallery/helpers/module.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'modules/gallery/helpers/module.php')

diff --git a/modules/gallery/helpers/module.php b/modules/gallery/helpers/module.php
index 2fd5be6c..0559ff04 100644
--- a/modules/gallery/helpers/module.php
+++ b/modules/gallery/helpers/module.php
@@ -78,10 +78,11 @@ class module_Core {
     foreach (glob(MODPATH . "*/module.info") as $file) {
       $module_name = basename(dirname($file));
       $modules->$module_name = new ArrayObject(parse_ini_file($file), ArrayObject::ARRAY_AS_PROPS);
-      $modules->$module_name->installed = self::is_installed($module_name);
-      $modules->$module_name->active = self::is_active($module_name);
-      $modules->$module_name->version = self::get_version($module_name);
-      $modules->$module_name->locked = false;
+      $m =& $modules->$module_name;
+      $m->installed = self::is_installed($module_name);
+      $m->active = self::is_active($module_name);
+      $m->version = self::get_version($module_name);
+      $m->locked = false;
     }
 
     // Lock certain modules
-- 
cgit v1.2.3


From 00b528afac33cd4e99fd3e5e648288a9d646eb38 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 9 Jun 2009 20:32:37 -0700
Subject: Cache the available module list in module::$available.

---
 modules/gallery/helpers/module.php | 35 ++++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 15 deletions(-)

(limited to 'modules/gallery/helpers/module.php')

diff --git a/modules/gallery/helpers/module.php b/modules/gallery/helpers/module.php
index 0559ff04..58f9b20d 100644
--- a/modules/gallery/helpers/module.php
+++ b/modules/gallery/helpers/module.php
@@ -27,6 +27,7 @@ class module_Core {
   public static $active = array();
   public static $modules = array();
   public static $var_cache = null;
+  public static $available = array();
 
   /**
    * Set the version of the corresponding Module_Model
@@ -74,23 +75,27 @@ class module_Core {
    * Return the list of available modules, including uninstalled modules.
    */
   static function available() {
-    $modules = new ArrayObject(array(), ArrayObject::ARRAY_AS_PROPS);
-    foreach (glob(MODPATH . "*/module.info") as $file) {
-      $module_name = basename(dirname($file));
-      $modules->$module_name = new ArrayObject(parse_ini_file($file), ArrayObject::ARRAY_AS_PROPS);
-      $m =& $modules->$module_name;
-      $m->installed = self::is_installed($module_name);
-      $m->active = self::is_active($module_name);
-      $m->version = self::get_version($module_name);
-      $m->locked = false;
-    }
+    if (empty(self::$available)) {
+      $modules = new ArrayObject(array(), ArrayObject::ARRAY_AS_PROPS);
+      foreach (glob(MODPATH . "*/module.info") as $file) {
+        $module_name = basename(dirname($file));
+        $modules->$module_name = new ArrayObject(parse_ini_file($file), ArrayObject::ARRAY_AS_PROPS);
+        $m =& $modules->$module_name;
+        $m->installed = self::is_installed($module_name);
+        $m->active = self::is_active($module_name);
+        $m->code_version = $m->version;
+        $m->version = self::get_version($module_name);
+        $m->locked = false;
+      }
 
-    // Lock certain modules
-    $modules->gallery->locked = true;
-    $modules->user->locked = true;
-    $modules->ksort();
+      // Lock certain modules
+      $modules->gallery->locked = true;
+      $modules->user->locked = true;
+      $modules->ksort();
+      self::$available = $modules;
+    }
 
-    return $modules;
+    return self::$available;
   }
 
   /**
-- 
cgit v1.2.3


From accce788d97d19663a4c39666de03a417b5837b6 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 9 Jun 2009 21:26:28 -0700
Subject: Fix a bug in set_version() where we were always forcing the value to
 1.  Oops!

---
 modules/gallery/helpers/module.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules/gallery/helpers/module.php')

diff --git a/modules/gallery/helpers/module.php b/modules/gallery/helpers/module.php
index 58f9b20d..dea8e22c 100644
--- a/modules/gallery/helpers/module.php
+++ b/modules/gallery/helpers/module.php
@@ -40,7 +40,7 @@ class module_Core {
       $module->name = $module_name;
       $module->active = $module_name == "gallery";  // only gallery is active by default
     }
-    $module->version = 1;
+    $module->version = $version;
     $module->save();
     Kohana::log("debug", "$module_name: version is now $version");
   }
-- 
cgit v1.2.3