diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/libraries/MY_View.php | 54 | ||||
| -rw-r--r-- | core/libraries/Theme.php | 42 |
2 files changed, 42 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; - } } diff --git a/core/libraries/Theme.php b/core/libraries/Theme.php index f95ef569..d7790626 100644 --- a/core/libraries/Theme.php +++ b/core/libraries/Theme.php @@ -57,4 +57,46 @@ class Theme_Core { return new View("in_place_edit.html"); } + /** + * Handle all theme functions that insert module content. + */ + public function __call($function, $args) { + switch ($function) { + case "admin": + case "head": + case "page_top": + case "page_bottom": + case "header_top": + case "header_bottom": + case "sidebar_top": + case "sidebar_blocks": + case "sidebar_bottom": + case "album_top": + case "album_blocks": + case "album_bottom": + case "photo_top": + case "photo_blocks": + case "photo_bottom": + if (empty($this->block_helpers[$function])) { + 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, $function)) { + $this->block_helpers[$function][] = "$helper_class"; + } + } + } + + $blocks = ""; + if (!empty($this->block_helpers[$function])) { + foreach ($this->block_helpers[$function] as $helper_class) { + $blocks .= call_user_func_array(array($helper_class, $function), array($this)) . "\n"; + } + } + return $blocks; + + default: + throw new Exception("@todo UNKNOWN_THEME_FUNCTION: $function"); + } + } } |