2 files changed, 11 insertions, 4 deletions
diff --git a/core/libraries/Admin_View.php b/core/libraries/Admin_View.php
index 332be596..267d06e8 100644
--- a/core/libraries/Admin_View.php
+++ b/core/libraries/Admin_View.php
@@ -98,6 +98,16 @@ class Admin_View_Core extends View {
             array_merge(array($this), $args));
         }
       }
+
+      if (Session::instance()->get("debug")) {
+        if ($function != "admin_head") {
+          array_unshift(
+            $blocks, "<div class=\"gAnnotatedThemeBlock gAnnotatedThemeBlock_$function\">" .
+            "<div class=\"title\">$function</div>");
+          $blocks[] = "</div>";
+        }
+      }
+
       return implode("\n", $blocks);
 
     default:
diff --git a/core/libraries/Theme_View.php b/core/libraries/Theme_View.php
index d4e7019e..794cb2fb 100644
--- a/core/libraries/Theme_View.php
+++ b/core/libraries/Theme_View.php
@@ -125,9 +125,6 @@ class Theme_View_Core extends View {
     case "thumb_info":
     case "thumb_top":
     case "photo_bottom":
-      // @todo: restrict access to this option
-      $debug = Session::instance()->get("debug", false);
-
       $blocks = array();
       foreach (module::installed() as $module) {
         $helper_class = "{$module->name}_block";
@@ -137,7 +134,7 @@ class Theme_View_Core extends View {
             array_merge(array($this), $args));
         }
       }
-      if ($debug) {
+      if (Session::instance()->get("debug")) {
         if ($function != "head") {
           array_unshift(
             $blocks, "<div class=\"gAnnotatedThemeBlock gAnnotatedThemeBlock_$function gClearFix\">" .