diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2009-05-02 20:49:09 +0000 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2009-05-02 20:49:09 +0000 |
| commit | 4b790f5b76dd1258cdd571a59a45681bfc1f9dab (patch) | |
| tree | 7d017393bf2fdb4b0fcf20a2f274f6c0ac8fff18 | |
| parent | 5950f492106a5927c3d3a6bffe8ed92a0fee8f9d (diff) | |
Revert r20668; if we call our helper 'gallery' then it interferes with g2_import since it uses the Gallery2 embed interface which loads up G2's Gallery class as well. Grumble.
| -rw-r--r-- | core/helpers/core.php (renamed from core/helpers/gallery.php) | 2 | ||||
| -rw-r--r-- | core/hooks/init_gallery.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/helpers/gallery.php b/core/helpers/core.php index 74ecd672..5e5a12a7 100644 --- a/core/helpers/gallery.php +++ b/core/helpers/core.php @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ -class gallery_Core { +class core_Core { static function maintenance_mode() { $maintenance_mode = Kohana::config("core.maintenance_mode", false, false); diff --git a/core/hooks/init_gallery.php b/core/hooks/init_gallery.php index 58511edf..536d8c64 100644 --- a/core/hooks/init_gallery.php +++ b/core/hooks/init_gallery.php @@ -27,7 +27,7 @@ Event::add("system.post_routing", array("theme", "load_themes")); Event::add("system.ready", array("module", "load_modules")); Event::add("system.post_routing", array("url", "parse_url")); Event::add("system.shutdown", array("module", "shutdown")); -Event::add("system.post_routing", array("gallery", "maintenance_mode")); +Event::add("system.post_routing", array("core", "maintenance_mode")); // Override the cookie if we have a session id in the URL. // @todo This should probably be an event callback |