diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2009-05-27 23:15:09 -0700 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2009-05-27 23:15:09 -0700 |
| commit | 93053cf83152082ce2fb365ad2ab6034c9edd4ee (patch) | |
| tree | 2b509460486741547cab2541ca372dbb4b43c02b /modules/gallery/helpers | |
| parent | 993eecfee61e502660f490bec5b394640b917bd1 (diff) | |
| parent | 38708920181f3bb7787ccd11128e5f6f0b74cbf7 (diff) | |
Merge branch 'master' of git://github.com/gallery/gallery3
Diffstat (limited to 'modules/gallery/helpers')
| -rw-r--r-- | modules/gallery/helpers/module.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/gallery/helpers/module.php b/modules/gallery/helpers/module.php index a6cc87ac..ad46b2ff 100644 --- a/modules/gallery/helpers/module.php +++ b/modules/gallery/helpers/module.php @@ -75,7 +75,7 @@ class module_Core { */ static function available() { $modules = new ArrayObject(array(), ArrayObject::ARRAY_AS_PROPS); - foreach (array_merge(array("gallery/module.info"), glob(MODPATH . "*/module.info")) as $file) { + foreach (glob(MODPATH . "*/module.info") as $file) { $module_name = basename(dirname($file)); $modules->$module_name = new ArrayObject(parse_ini_file($file), ArrayObject::ARRAY_AS_PROPS); $modules->$module_name->installed = self::is_installed($module_name); |