From 7aed9239088b582a065da3fb63796ff66cd357c8 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 26 May 2009 05:28:59 +0000
Subject: Restructure the module lifecycle.

Install: <module>_installer::install() is called, any necessary tables
are created.

Activate: <module>_installer::activate() is called.  Module
controllers are routable, helpers are accessible, etc.  The module is
in use.

Deactivate: <module>_installer::deactivate() is called.  Module code
is not accessible or routable.  Module is *not* in use, but its tables
are still around.

Uninstall: <module>_installer::uninstall() is called.  Module is
completely removed from the database.

Admin > Modules will install and activate modules, but will only
deactivate (will NOT uninstall modules).
---
 core/libraries/Admin_View.php | 4 ++--
 core/libraries/Theme_View.php | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'core/libraries')

diff --git a/core/libraries/Admin_View.php b/core/libraries/Admin_View.php
index 94f9fead..acc3f8ec 100644
--- a/core/libraries/Admin_View.php
+++ b/core/libraries/Admin_View.php
@@ -59,7 +59,7 @@ class Admin_View_Core extends View {
     $menu = Menu::factory("root");
     core_menu::admin($menu, $this);
 
-    foreach (module::installed() as $module) {
+    foreach (module::active() as $module) {
       if ($module->name == "core") {
         continue;
       }
@@ -99,7 +99,7 @@ class Admin_View_Core extends View {
     case "admin_page_top":
     case "admin_head":
       $blocks = array();
-      foreach (module::installed() as $module) {
+      foreach (module::active() as $module) {
         $helper_class = "{$module->name}_theme";
         if (method_exists($helper_class, $function)) {
           $blocks[] = call_user_func_array(
diff --git a/core/libraries/Theme_View.php b/core/libraries/Theme_View.php
index dafb66f6..b5b97666 100644
--- a/core/libraries/Theme_View.php
+++ b/core/libraries/Theme_View.php
@@ -93,7 +93,7 @@ class Theme_View_Core extends View {
     if ($this->page_type != "login") {
       core_menu::site($menu, $this);
 
-      foreach (module::installed() as $module) {
+      foreach (module::active() as $module) {
         if ($module->name == "core") {
           continue;
         }
@@ -111,7 +111,7 @@ class Theme_View_Core extends View {
     $menu = Menu::factory("root");
     core_menu::album($menu, $this);
 
-    foreach (module::installed() as $module) {
+    foreach (module::active() as $module) {
       if ($module->name == "core") {
         continue;
       }
@@ -128,7 +128,7 @@ class Theme_View_Core extends View {
     $menu = Menu::factory("root");
     core_menu::photo($menu, $this);
 
-    foreach (module::installed() as $module) {
+    foreach (module::active() as $module) {
       if ($module->name == "core") {
         continue;
       }
@@ -196,7 +196,7 @@ class Theme_View_Core extends View {
     case "thumb_info":
     case "thumb_top":
       $blocks = array();
-      foreach (module::installed() as $module) {
+      foreach (module::active() as $module) {
         $helper_class = "{$module->name}_theme";
         if (method_exists($helper_class, $function)) {
           $blocks[] = call_user_func_array(
-- 
cgit v1.2.3