Correct case on helper class names. By convention, helper class names are lower case:

http://docs.kohanaphp.com/general/helpers

Remove block_helper file as the abstract class os no longer required.

6 files changed, 5 insertions, 54 deletions

diff --git a/core/helpers/album.php b/core/helpers/album.php
index 9c36dc6f..bae682fa 100644
--- a/core/helpers/album.php
+++ b/core/helpers/album.php
@@ -23,7 +23,7 @@
  *
  * Note: by design, this class does not do any permission checking.
  */
-class Album_Core {
+class album_Core {
   /**
    * Create a new album.
    * @param integer $parent_id id of parent album
diff --git a/core/helpers/block_helper.php b/core/helpers/block_helper.php
deleted file mode 100644
index 5f49d444..00000000
--- a/core/helpers/block_helper.php
+++ /dev/null
@@ -1,49 +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.
- */
-abstract class block_helper_Core {
-
-  public static function admin() {
-    return "";
-  }
-
-  public static function head() {
-    return "";
-  }
-
-  public static function top() {
-    return "";
-  }
-
-  public static function bottom() {
-    return "";
-  }
-
-  public static function sidebar() {
-    return "";
-  }
-
-  public static function album() {
-    return "";
-  }
-
-  public static function photo() {
-    return "";
-  }
-}
diff --git a/core/helpers/module.php b/core/helpers/module.php
index 7916e07d..2fed23bf 100644
--- a/core/helpers/module.php
+++ b/core/helpers/module.php
@@ -23,7 +23,7 @@
  *
  * Note: by design, this class does not do any permission checking.
  */
-class Module_Core {
+class module_Core {
   public static function get_version($module_name) {
     return ORM::factory("module")->where("name", $module_name)->find()->version;
   }
diff --git a/core/helpers/photo.php b/core/helpers/photo.php
index b3669c96..2a64ff55 100644
--- a/core/helpers/photo.php
+++ b/core/helpers/photo.php
@@ -23,7 +23,7 @@
  *
  * Note: by design, this class does not do any permission checking.
  */
-class Photo_Core {
+class photo_Core {
   /**
    * Create a new photo.
    * @param integer $parent_id id of parent album
diff --git a/core/helpers/rest.php b/core/helpers/rest.php
index b1f777cf..f1c191c2 100644
--- a/core/helpers/rest.php
+++ b/core/helpers/rest.php
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-class REST_Core {
+class rest_Core {
   const OK = "200 OK";
   const CREATED = "201 Created";
   const ACCEPTED = "202 Accepted";
diff --git a/core/helpers/xml.php b/core/helpers/xml.php
index 2700b5ae..09168ce8 100644
--- a/core/helpers/xml.php
+++ b/core/helpers/xml.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 Xml_Core {
+class xml_Core {
   public static function to_xml($array, $element_names) {
     $xml = "<$element_names[0]>\n";
     foreach ($array as $key => $value) {