Move all block callbacks from View::block_type() to

$theme->block_type() so that the themer has a consistent interface.
Also added a bunch more callbacks and normalized the names so that the
module author has plenty of options for where stuff gets put on the
page.  Especially renamed album/photo/sidebar to be album_blocks()
photo_blocks() and sidebar_blocks() to make it clear that those are
going to be larger content sections and not just basic insertion
points.

Used __call() to collapse all functions in the theme, which
incidentally makes it trivially easy to add a new insertion point.

1 files changed, 0 insertions, 54 deletions

diff --git a/core/libraries/MY_View.php b/core/libraries/MY_View.php
index fe2ef12e..26326b5d 100644
--- a/core/libraries/MY_View.php
+++ b/core/libraries/MY_View.php
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class View extends View_Core {
-  private static $block_helpers = null;
-
   /**
    * Override View_Core::render so that we trap errors stemming from bad PHP includes and show a
    * visible stack trace to help developers.
@@ -40,56 +38,4 @@ class View extends View_Core {
       return "";
     }
   }
-
-  public static function admin($theme) {
-    return self::_get_block_helpers("admin", $theme);
-  }
-
-  public static function head($theme) {
-    return self::_get_block_helpers("head", $theme);
-  }
-
-  public static function top($theme) {
-    return self::_get_block_helpers("top", $theme);
-  }
-
-  public static function bottom($theme) {
-    return self::_get_block_helpers("bottom", $theme);
-  }
-
-  public static function sidebar($theme) {
-    return self::_get_block_helpers("sidebar", $theme);
-  }
-
-  public static function album($theme) {
-    return self::_get_block_helpers("album", $theme);
-  }
-
-  public static function album_top($theme) {
-    return self::_get_block_helpers("album_top", $theme);
-  }
-
-  public static function photo($theme) {
-    return self::_get_block_helpers("photo", $theme);
-  }
-
-  private static function _get_block_helpers($method, $theme) {
-    if (empty(self::$block_helpers[$method])) {
-      foreach (module::get_list() as $module) {
-        $helper_path = MODPATH . "$module->name/helpers/{$module->name}_block.php";
-        $helper_class = "{$module->name}_block";
-        if (file_exists($helper_path) && method_exists($helper_class, $method)) {
-          self::$block_helpers[$method][] = "$helper_class";
-        }
-      }
-    }
-
-    $blocks = "";
-    if (!empty(self::$block_helpers[$method])) {
-      foreach (self::$block_helpers[$method] as $helper_class) {
-        $blocks .= call_user_func_array(array($helper_class, $method), array($theme)) . "\n";
-      }
-    }
-    return $blocks;
-  }
 }