Changeset 298

Show
Ignore:
Timestamp:
04/24/06 00:15:41 (3 years ago)
Author:
carmartin
Message:

Includes should use full path given that we know where things are. Patch 3. Deprecate the "path" constant.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • devel/includes.php

    r297 r298  
    5454         
    5555    // Visual editor (tinyMCE) 
    56         @include(path . "units/tinymce/main.php"); 
     56        @include($CFG->dirroot . "units/tinymce/main.php"); 
    5757     
    5858    // Calendaring system 
    59     //    require(path . "units/calendar/main.php"); 
     59    //    require($CFG->dirroot . "units/calendar/main.php"); 
    6060     
    6161    /*************************************************************************** 

  • devel/includes_system.php

    r269 r298  
    6868     
    6969    // Plug-in engine (must be loaded first) 
    70         require(path . "units/engine/main.php"); 
     70        require($CFG->dirroot . "units/engine/main.php"); 
    7171    // Language / internationalisation 
    72         require(path . "units/gettext/main.php"); 
     72        require($CFG->dirroot . "units/gettext/main.php"); 
    7373    // Database 
    74         require(path . "units/db/main.php"); 
     74        require($CFG->dirroot . "units/db/main.php"); 
    7575    // Display 
    76         require(path . "units/display/main.php"); 
     76        require($CFG->dirroot . "units/display/main.php"); 
    7777    // Users 
    78         require(path . "units/users/main.php"); 
     78        require($CFG->dirroot . "units/users/main.php"); 
    7979    // Templates 
    80         require(path . "units/templates/main.php"); 
     80        require($CFG->dirroot . "units/templates/main.php"); 
    8181    // Edit permissions 
    82         require(path . "units/permissions/main.php"); 
     82        require($CFG->dirroot . "units/permissions/main.php"); 
    8383         
    8484    // User icons 
    85         include(path . "units/icons/main.php"); 
     85        include($CFG->dirroot . "units/icons/main.php"); 
    8686    // Profiles 
    87         include(path . "units/profile/main.php"); 
     87        include($CFG->dirroot . "units/profile/main.php"); 
    8888         
    8989    // Weblog 
    90         include(path . "units/weblogs/main.php"); 
     90        include($CFG->dirroot . "units/weblogs/main.php"); 
    9191     
    9292    // File repository 
    93         include(path . "units/files/main.php"); 
     93        include($CFG->dirroot . "units/files/main.php"); 
    9494                 
    9595    // Communities 
    96         require(path . "units/communities/main.php"); 
     96        require($CFG->dirroot . "units/communities/main.php"); 
    9797         
    9898    // Friends 
    99         include(path . "units/friends/main.php"); 
     99        include($CFG->dirroot . "units/friends/main.php"); 
    100100    // Friend groups 
    101         include(path . "units/groups/main.php"); 
     101        include($CFG->dirroot . "units/groups/main.php"); 
    102102         
    103103    // Search 
    104         require(path . "units/search/main.php"); 
     104        require($CFG->dirroot . "units/search/main.php"); 
    105105         
    106106    // Invite-a-friend 
    107         require(path . "units/invite/main.php"); 
     107        require($CFG->dirroot . "units/invite/main.php"); 
    108108         
    109109    // Admin system 
    110         require(path . "units/admin/main.php"); 
     110        require($CFG->dirroot . "units/admin/main.php"); 
    111111         
    112112    // XML parsing 
    113         require(path . "units/xml/main.php"); 
     113        require($CFG->dirroot . "units/xml/main.php"); 
    114114         
    115115    // Your Resources 
    116         require(path . "units/magpie/main.php"); 
     116        require($CFG->dirroot . "units/magpie/main.php"); 
    117117         
    118118?> 

  • devel/units/icons/function_actions.php

    r271 r298  
    9090                // $ok = false; 
    9191                // $messages[] = gettext("The uploaded icon file was too large. Files must have maximum dimensions of 100x100."); 
    92                 require_once(path . 'units/phpthumb/phpthumb.class.php'); 
     92                require_once($CFG->dirroot . 'units/phpthumb/phpthumb.class.php'); 
    9393                $phpThumb = new phpThumb(); 
    9494                $phpThumb->setSourceFilename($um->get_new_filepath()); 

  • devel/units/magpie/function_init.php

    r269 r298  
    55        define('rss','true'); 
    66        define('MAGPIE_DIR', path . "units/magpie/"); 
    7         include_once(path . 'units/magpie/rss_fetch.inc'); 
     7        include_once($CFG->dirroot . 'units/magpie/rss_fetch.inc'); 
    88         
    99?> 

  • devel/units/magpie/main.php

    r269 r298  
    55 
    66    // Library functions 
    7         require_once(path . "units/magpie/library.php");     
     7        require_once($CFG->dirroot . "units/magpie/library.php");     
    88     
    99    // Load default template