diff options
| -rw-r--r-- | engine/classes/ElggPlugin.php | 4 | ||||
| -rw-r--r-- | engine/lib/plugins.php | 14 |
2 files changed, 4 insertions, 14 deletions
diff --git a/engine/classes/ElggPlugin.php b/engine/classes/ElggPlugin.php index 208d1eff8..69b3b1c67 100644 --- a/engine/classes/ElggPlugin.php +++ b/engine/classes/ElggPlugin.php @@ -200,10 +200,6 @@ class ElggPlugin extends ElggObject { return false; } - if ($priority == $old_priority) { - return false; - } - // there's nothing above the max. if ($priority > $max_priority) { $priority = $max_priority; diff --git a/engine/lib/plugins.php b/engine/lib/plugins.php index 981896588..c54c12afd 100644 --- a/engine/lib/plugins.php +++ b/engine/lib/plugins.php @@ -124,8 +124,6 @@ function elgg_generate_plugin_entities() { return false; } - $new_plugin_priority = elgg_get_max_plugin_priority() + 1; - // check real plugins against known ones foreach ($physical_plugins as $plugin_id) { // is this already in the db? @@ -136,20 +134,16 @@ function elgg_generate_plugin_entities() { if ($plugin->enabled != 'yes') { $plugin->enable(); $plugin->deactivate(); - $plugin->setPriority($new_plugin_priority); - - $new_plugin_priority++; + $plugin->setPriority('last'); } // remove from the list of plugins to disable unset($known_plugins[$index]); } else { // add new plugins + // priority is force to last in save() if not set. $plugin = new ElggPlugin($plugin_id); $plugin->save(); - $plugin->setPriority($new_plugin_priority); - - $new_plugin_priority++; } } @@ -235,11 +229,11 @@ function elgg_get_max_plugin_priority() { $data = get_data($q); if ($data) { - return $data[0]->max; + $max = $data[0]->max; } // can't have a priority of 0. - return 1; + return ($max) ? $max : 1; } /** |