Merge out from the pre_0.1 branch (previous so called 'merge in' was also really a merge out)
git-svn-id: file:///svn-source/pmgr/branches/sandbox_0.1@796 97e9348a-65ac-dc4b-aefc-98561f571b83
This commit is contained in:
@@ -40,10 +40,10 @@ class AppController extends Controller {
|
||||
|
||||
var $sidemenu = array('areas' => array('SITE' => false, 'CONTROLLER' => false, 'ACTION' => false));
|
||||
var $std_area = 10;
|
||||
var $new_area = 20;
|
||||
var $op_area = 30;
|
||||
var $admin_area = 40;
|
||||
var $dev_area = 50;
|
||||
var $admin_area = 20;
|
||||
var $dev_area = 30;
|
||||
var $op_area = 40;
|
||||
var $new_area = 50;
|
||||
|
||||
function __construct() {
|
||||
$this->params['dev'] = false;
|
||||
|
||||
Reference in New Issue
Block a user