Fixes #3011. on_activate and on_deactivate work for plugins now. Updated the categori...

git-svn-id: http://code.elgg.org/elgg/trunk@8507 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/engine/classes/ElggPlugin.php b/engine/classes/ElggPlugin.php
index 5ecdfdfd041e950994f23ed0b8ac793908ddd058..18d97d23a83a335609d5c0203f7cb772fede2d1e 100644 (file)
--- a/engine/classes/ElggPlugin.php
+++ b/engine/classes/ElggPlugin.php
@@ -648,9 +648,9 @@ class ElggPlugin extends ElggObject {
                                        if (!is_callable($function)) {
                                                $return = false;
                                        } else {
-                                               $on_enable = call_user_func($function);
+                                               $result = call_user_func($function);
                                                // allow null to mean "I don't care" like other subsystems
-                                               $return = ($on_disable === false) ? false: true;
+                                               $return = ($result === false) ? false: true;
                                        }
 
                                        if ($return === false) {
@@ -702,9 +702,9 @@ class ElggPlugin extends ElggObject {
                                if (!is_callable($function)) {
                                        $return = false;
                                } else {
-                                       $on_enable = call_user_func($function);
+                                       $result = call_user_func($function);
                                        // allow null to mean "I don't care" like other subsystems
-                                       $return = ($on_disable === false) ? false : true;
+                                       $return = ($result === false) ? false : true;
                                }
 
                                if ($return === false) {

diff --git a/mod/categories/manifest.xml b/mod/categories/manifest.xml
index 89c7d452be61ef9b7f93ad568568d88bbff05743..9b004c1d2899b6457746656a8f67df71b3970dc4 100644 (file)
--- a/mod/categories/manifest.xml
+++ b/mod/categories/manifest.xml
@@ -13,6 +13,6 @@
                <version>2010030101</version>
        </requires>
        <admin_interface>advanced</admin_interface>
-       <on_enable>categories_on_enable</on_enable>
-       <on_disable>categories_on_disable</on_disable>
+       <on_activate>categories_on_activate</on_activate>
+       <on_deactivate>categories_on_deactivate</on_deactivate>
 </plugin_manifest>

diff --git a/mod/categories/start.php b/mod/categories/start.php
index bc272274f68b44059780d37da4a5cf2cf5dec1a5..9ff729b251272f7b6703c76501bfbaaf1bd18154 100644 (file)
--- a/mod/categories/start.php
+++ b/mod/categories/start.php
@@ -58,7 +58,9 @@ function categories_save($event, $object_type, $object) {
 /**
  * Add a reminder to set default categories.
  */
-function categories_on_enable() {
+function categories_on_activate() {
+       $site = elgg_get_site_entity();
+       
        if (!$site->categories) {
                $url = elgg_normalize_url('pg/admin/plugin_settings/categories');
                $message = elgg_echo('categories:on_enable_reminder', array($url));
@@ -70,6 +72,6 @@ function categories_on_enable() {
 /**
  * Clean up admin notices on disable.
  */
-function categories_on_disable() {
+function categories_on_deactivate() {
        elgg_delete_admin_notice('categories_admin_notice_no_categories');
 }