Ticket #252: include_order.diff

File include_order.diff, 2.0 kB (added by renato, 9 months ago)
  • lib/setup.php

    old new  
    411411////// 
    412412if (!isset($CFG->templatestore)) { $CFG->templatestore = 'db' ;} 
    413413if (!isset($CFG->templatesroot)) { $CFG->templatesroot = $CFG->dirroot . "mod/template/templates/";} 
    414 if (!isset($PAGE->menu       )) { $PAGE->menu        = array();} 
    415 if (!isset($PAGE->menu_sub   )) { $PAGE->menu_sub    = array();} 
    416 if (!isset($PAGE->menu_top   )) { $PAGE->menu_top    = array();} 
    417 if (!isset($PAGE->menu_bottom)) { $PAGE->menu_bottom = array();} 
     414//if (!isset($PAGE->menu       )) { $PAGE->menu        = array();} 
     415//if (!isset($PAGE->menu_sub   )) { $PAGE->menu_sub    = array();} 
     416//if (!isset($PAGE->menu_top   )) { $PAGE->menu_top    = array();} 
     417//if (!isset($PAGE->menu_bottom)) { $PAGE->menu_bottom = array();} 
    418418 
    419419////// 
    420420////// Define what modules we have, and load their libraries 
  • includes.php

    old new  
    103103    *    CORE FUNCTIONALITY LIBRARIES 
    104104    ****************************************************************************/ 
    105105 
    106     // Language / internationalisation 
    107     //@todo All the libraries has a strong dependence with this 'plugin' 
    108         require_once($CFG->dirroot . "mod/gettext/lib.php"); 
    109  
    110106    // Load setup.php which will initialize database connections and such like. 
    111107        require_once($CFG->dirroot.'lib/setup.php'); 
    112108 
    113109    // Plug-in engine (must be loaded first) 
    114110        require($CFG->dirroot . "lib/engine.php"); 
    115111 
     112    // Language / internationalisation 
     113    //@todo All the libraries has a strong dependence with this 'plugin' 
     114        require_once($CFG->dirroot . "mod/gettext/lib.php"); 
     115 
    116116    // XML parsing 
    117117        require($CFG->dirroot . "lib/xmllib.php"); 
    118118 
     
    144144            require_login(); 
    145145        } 
    146146