abijah/pmgr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge in the hosted_migration_20130215 branch to the v0.3_work branch

Browse Source 
git-svn-id: file:///svn-source/pmgr/branches/v0.3_work@1030 97e9348a-65ac-dc4b-aefc-98561f571b83
This commit is contained in:
Abijah
2013-12-05 01:24:21 +00:00
parent 20284046c3
commit 98d9849914
15 changed files with 65 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
site/app_controller.php
View File

@@ -37,7 +37,7 @@
class AppController extends Controller {
var $uses = array('Option', 'Permission');
var $helpers = array('Html', 'Form', 'Javascript', 'Format', 'Time', 'Grid');
var $components = array('DebugKit.Toolbar');
//var $components = array('DebugKit.Toolbar');
var $sidemenu = array('areas' => array('SITE' => false, 'REPORT' => false, 'CONTROLLER' => false, 'ACTION' => false, 'SANDBOX' => false));
var $std_area = 10;
@@ -464,7 +464,8 @@ class AppController extends Controller {
App::import('Helper', 'Html');
$url = HtmlHelper::url($url, true);
if (headers_sent()) {
if (headers_sent() ||
($this->dev() && $this->Option->enabled('dev'))) {
// If we've already sent the headers, it's because
// we're debugging, and our debug output has gotten
// out before the redirect. That's probably a good