diff options
| author | Brett Profitt <brett.profitt@gmail.com> | 2011-04-18 19:54:17 -0400 |
|---|---|---|
| committer | Brett Profitt <brett.profitt@gmail.com> | 2011-04-18 19:54:17 -0400 |
| commit | 0d9c5c1ccd66018a819b4ca327ab203f473e35dc (patch) | |
| tree | f55e5caa8bf8036b02fc553eecd2b615791d2ce5 /engine/classes/ElggPluginManifestParser18.php | |
| parent | ca63a6b81eee1dfbee99a393a790402475a4612c (diff) | |
| parent | d928588805375e7190ab393e2def555b39701a27 (diff) | |
| download | elgg-0d9c5c1ccd66018a819b4ca327ab203f473e35dc.tar.gz elgg-0d9c5c1ccd66018a819b4ca327ab203f473e35dc.tar.bz2 | |
Merge branch 'master' of github.com:Elgg/Elgg
Diffstat (limited to 'engine/classes/ElggPluginManifestParser18.php')
| -rw-r--r-- | engine/classes/ElggPluginManifestParser18.php | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/engine/classes/ElggPluginManifestParser18.php b/engine/classes/ElggPluginManifestParser18.php index 38734f6b4..db8b3dc6a 100644 --- a/engine/classes/ElggPluginManifestParser18.php +++ b/engine/classes/ElggPluginManifestParser18.php @@ -15,8 +15,8 @@ class ElggPluginManifestParser18 extends ElggPluginManifestParser { protected $validAttributes = array( 'name', 'author', 'version', 'blurb', 'description', 'website', 'copyright', 'license', 'requires', 'suggests', - 'screenshot', 'category', 'conflicts', 'provides', 'on_activate', - 'on_deactivate', 'admin_interface', 'activate_on_install' + 'screenshot', 'category', 'conflicts', 'provides', + 'admin_interface', 'activate_on_install' ); /** @@ -52,8 +52,6 @@ class ElggPluginManifestParser18 extends ElggPluginManifestParser { break; // arrays - case 'on_activate': - case 'on_deactivate': case 'category': $parsed[$element->name][] = $element->content; break; |