From ed2cb2a86d691895ce4dac9b6de6665c5021c4c4 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 1 Dec 2008 10:40:40 +0000
Subject: Fix profiler settings in the scaffolding

---
 core/controllers/welcome.php | 5 +++++
 core/views/welcome.html.php  | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'core')

diff --git a/core/controllers/welcome.php b/core/controllers/welcome.php
index 71fdcdc4..2e58bd93 100644
--- a/core/controllers/welcome.php
+++ b/core/controllers/welcome.php
@@ -53,6 +53,11 @@ class Welcome_Controller extends Template_Controller {
     set_error_handler($old_handler);
 
     $this->_create_directories();
+
+    if (Session::instance()->get("profiler", false)) {
+      $profiler = new Profiler();
+      $profiler->render();
+    }
   }
 
   function install($module_name) {
diff --git a/core/views/welcome.html.php b/core/views/welcome.html.php
index 031b245f..89310e3d 100644
--- a/core/views/welcome.html.php
+++ b/core/views/welcome.html.php
@@ -402,7 +402,7 @@
               </li>
               <? endif ?>
               <li> Profiling:
-                <? if (Session::instance()->get("use_profiler", false)): ?>
+                <? if (Session::instance()->get("profiler", false)): ?>
                 <b>on</b> <?= html::anchor("welcome/session/profiler?value=0", "off") ?>
                 <? else: ?>
                 <?= html::anchor("welcome/session/profiler?value=1", "on") ?> <b>off</b>
-- 
cgit v1.2.3