diff options
| author | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2011-02-27 22:48:42 +0000 |
|---|---|---|
| committer | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2011-02-27 22:48:42 +0000 |
| commit | d1b4235b5dd26559334a7b57dcf9e53a3042e354 (patch) | |
| tree | 929400f35b00c2e25096cb350c25e02a53ed06f6 /engine/classes | |
| parent | f61076fec0c1cfdee089f89c10cb46b7d195f9c7 (diff) | |
| download | elgg-d1b4235b5dd26559334a7b57dcf9e53a3042e354.tar.gz elgg-d1b4235b5dd26559334a7b57dcf9e53a3042e354.tar.bz2 | |
Fixes #3011. on_activate and on_deactivate work for plugins now. Updated the categories plugin to use it.
git-svn-id: http://code.elgg.org/elgg/trunk@8507 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine/classes')
| -rw-r--r-- | engine/classes/ElggPlugin.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/classes/ElggPlugin.php b/engine/classes/ElggPlugin.php index 5ecdfdfd0..18d97d23a 100644 --- 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) { |