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.

1 files changed, 1 insertions, 1 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);