2 files changed, 29 insertions, 1 deletions
diff --git a/core/controllers/admin_modules.php b/core/controllers/admin_modules.php
new file mode 100644
index 00000000..12686f87
--- /dev/null
+++ b/core/controllers/admin_modules.php
@@ -0,0 +1,27 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2008 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+class Admin_Modules_Controller extends Admin_Controller {
+  public function index() {
+    $view = new View("admin_modules.html");
+    $view->available = module::available();
+    return $view;
+  }
+}
+
diff --git a/core/controllers/welcome.php b/core/controllers/welcome.php
index d6c40850..b253f13f 100644
--- a/core/controllers/welcome.php
+++ b/core/controllers/welcome.php
@@ -425,12 +425,13 @@ class Welcome_Controller extends Template_Controller {
     $modules = module::available();
     try {
       foreach (module::installed() as $installed_module) {
-        $modules[$installed_module->name] = $installed_module->version;
+        $modules->$installed_module->version = $installed_module->version;
       }
     } catch (Exception $e) {
       // The database may not be installed
     }
     ksort($modules);
+
     return $modules;
   }