Quick Search:

Context

Displaying 3 lines either side each change. None | Less | More | Full

Other Diffs

Ignore

Blank Lines Whitespace:

Diff

308
 
311
 
311
 
app_controller.php
_>4040 class AppController extends Controller {
 4141 
 4242     var $components = array('Auth', 'StdFuncs','MyAcl','Menu','RequestHandler');
<>43 -    var $helpers = array('Html','Ajax','Javascript');
  43+    var $helpers = array('Html','Ajax','Javascript', 'Tree');
4444     var $layout = 'green';
<> 45+    var $main_menu_id = -1;
4546     
 4647     function setFlash($msg,$key){
 4748         $_SESSION['Message'][$key][]=$msg;
     
 !
6465         
 6566         $this->Auth->authorize = 'controller';
 6667         
<>67 -        
 68 -        $this->set('mainMenu',$this->Menu->createMenu($this->Session->read('main_menu_id')));
 69 -        $this->set('subMenu',$this->Menu->createMenu($this->Session->read('sub_menu_id')));
  68+        //pr($this->Menu->createMenu($this->main_menu_id));
  69+        $this->set('Menu',$this->Menu->createMenu($this->main_menu_id));
<_7070 
 7171         if(isset($this->needsproject)){
 7272             if((is_array($this->needsproject) && in_array($this->action, $this->needsproject)) || $this->needsproject===true){ //If the controller/action needs a project