diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2010-01-25 19:49:17 -0800 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2010-01-25 19:49:17 -0800 |
| commit | 1606961153fca681895a4f0145f7794000337539 (patch) | |
| tree | 30a8fc8ed2dfcafe1c1aea13432ccd4b5a26be40 /modules/gallery/helpers/module.php | |
| parent | cc912935731c216a57e4c291548ec503a0c1607e (diff) | |
| parent | 6023f2bb46598f9da096d63f7ab1dfb914eab6f7 (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_dev
Conflicts:
modules/gallery/libraries/MY_ORM.php
Diffstat (limited to 'modules/gallery/helpers/module.php')
| -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 f680ff6a..95e426c4 100644 --- a/modules/gallery/helpers/module.php +++ b/modules/gallery/helpers/module.php @@ -98,7 +98,7 @@ class module_Core { $m->active = self::is_active($module_name); $m->code_version = $m->version; $m->version = self::get_version($module_name); - $m->locked = !empty($m->no_module_admin); + $m->locked = false; } // Lock certain modules |