From 4b790f5b76dd1258cdd571a59a45681bfc1f9dab Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 2 May 2009 20:49:09 +0000
Subject: 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.

---
 core/helpers/core.php       | 30 ++++++++++++++++++++++++++++++
 core/helpers/gallery.php    | 30 ------------------------------
 core/hooks/init_gallery.php |  2 +-
 3 files changed, 31 insertions(+), 31 deletions(-)
 create mode 100644 core/helpers/core.php
 delete mode 100644 core/helpers/gallery.php

(limited to 'core')

diff --git a/core/helpers/core.php b/core/helpers/core.php
new file mode 100644
index 00000000..5e5a12a7
--- /dev/null
+++ b/core/helpers/core.php
@@ -0,0 +1,30 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2008 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+class core_Core {
+  static function maintenance_mode() {
+    $maintenance_mode = Kohana::config("core.maintenance_mode", false, false);
+
+    if (Router::$controller != "login" && !empty($maintenance_mode) && !user::active()->admin) {
+      Router::$controller = "maintenance";
+      Router::$controller_path = APPPATH . "controllers/maintenance.php";
+      Router::$method = "index";
+    }
+  }
+}
\ No newline at end of file
diff --git a/core/helpers/gallery.php b/core/helpers/gallery.php
deleted file mode 100644
index 74ecd672..00000000
--- a/core/helpers/gallery.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");
-/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2008 Bharat Mediratta
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * 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 {
-  static function maintenance_mode() {
-    $maintenance_mode = Kohana::config("core.maintenance_mode", false, false);
-
-    if (Router::$controller != "login" && !empty($maintenance_mode) && !user::active()->admin) {
-      Router::$controller = "maintenance";
-      Router::$controller_path = APPPATH . "controllers/maintenance.php";
-      Router::$method = "index";
-    }
-  }
-}
\ No newline at end of file
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
-- 
cgit v1.2.3