diff options
Diffstat (limited to 'engine/classes/ElggPluginManifestParser18.php')
| -rw-r--r-- | engine/classes/ElggPluginManifestParser18.php | 33 |
1 files changed, 15 insertions, 18 deletions
diff --git a/engine/classes/ElggPluginManifestParser18.php b/engine/classes/ElggPluginManifestParser18.php index 54aa9603f..3b753f17b 100644 --- a/engine/classes/ElggPluginManifestParser18.php +++ b/engine/classes/ElggPluginManifestParser18.php @@ -13,9 +13,10 @@ class ElggPluginManifestParser18 extends ElggPluginManifestParser { * @var array */ protected $validAttributes = array( - 'name', 'author', 'version', 'blurb', 'description', - 'website', 'copyright', 'license', 'requires', 'screenshot', - 'category', 'conflicts', 'provides', 'admin' + 'name', 'author', 'version', 'blurb', 'description','website', + 'repository', 'bugtracker', 'donations', 'copyright', 'license', + 'requires', 'suggests', 'conflicts', 'provides', + 'screenshot', 'category', 'activate_on_install' ); /** @@ -45,30 +46,24 @@ class ElggPluginManifestParser18 extends ElggPluginManifestParser { case 'website': case 'copyright': case 'license': + case 'repository': + case 'bugtracker': + case 'donations': + case 'activate_on_install': $parsed[$element->name] = $element->content; break; // arrays case 'category': - $parsed['category'][] = $element->content; - break; - - case 'admin': - $parsed['admin'] = array(); - if (!isset($element->children)) { - return false; - } - - foreach ($element->children as $child_element) { - $parsed['admin'][$child_element->name] = $child_element->content; - } - + $parsed[$element->name][] = $element->content; break; + // 3d arrays case 'screenshot': case 'provides': case 'conflicts': case 'requires': + case 'suggests': if (!isset($element->children)) { return false; } @@ -91,10 +86,12 @@ class ElggPluginManifestParser18 extends ElggPluginManifestParser { } } - if (!$this->manifest = $parsed) { + $this->manifest = $parsed; + + if (!$this->manifest) { return false; } return true; } -}
\ No newline at end of file +} |