stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-05-19 10:59:16 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

#2050 - Update Admin_View to handle events like Theme_View.

Browse Source 
- changed Admin_View event handling to reflect that of Theme_View
(gallery_theme gets called first, admin theme gets called last,
debug mode isn't called for body_attributes and gets g-clear-fix)
This commit is contained in:
shadlaws
2013-03-11 11:40:15 +01:00
parent 4d631a4cad
commit c137740e26
1 changed files with 31 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
modules/gallery/libraries/Admin_View.php
View File

@@ -93,7 +93,28 @@ class Admin_View_Core extends Gallery_View {
case "body_attributes":
case "html_attributes":
$blocks = array();
if (method_exists("gallery_theme", $function)) {
switch (count($args)) {
case 0:
$blocks[] = gallery_theme::$function($this);
break;
case 1:
$blocks[] = gallery_theme::$function($this, $args[0]);
break;
case 2:
$blocks[] = gallery_theme::$function($this, $args[0], $args[1]);
break;
default:
$blocks[] = call_user_func_array(
array("gallery_theme", $function),
array_merge(array($this), $args));
}
}
foreach (module::active() as $module) {
if ($module->name == "gallery") {
continue;
}
$helper_class = "{$module->name}_theme";
if (class_exists($helper_class) && method_exists($helper_class, $function)) {
$blocks[] = call_user_func_array(
@@ -102,15 +123,22 @@ class Admin_View_Core extends Gallery_View {
}
}
$helper_class = theme::$admin_theme_name . "_theme";
if (class_exists($helper_class) && method_exists($helper_class, $function)) {
$blocks[] = call_user_func_array(
array($helper_class, $function),
array_merge(array($this), $args));
}
if (Session::instance()->get("debug")) {
if ($function != "admin_head") {
if ($function != "admin_head" && $function != "body_attributes") {
array_unshift(
$blocks, "<div class=\"g-annotated-theme-block g-annotated-theme-block_$function\">" .
$blocks,
"<div class=\"g-annotated-theme-block g-annotated-theme-block_$function g-clear-fix\">" .
"<div class=\"title\">$function</div>");
$blocks[] = "</div>";
}
}
return implode("\n", $blocks);
default: