Changeset 1527

Show
Ignore:
Timestamp:
01/24/08 13:43:36 (7 months ago)
Author:
ewout
Message:

Move the gettext library inclusion after setup.php. Resolves #252. Thanks for the patches and investigation, Renato and Rho.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • devel/includes.php

    r1461 r1527  
    1515    <h1>Elgg isn't ready to run just yet.</h1> 
    1616    <p> 
    17         There isn't a whole lot of work to do to get up and running, but 
     17        There is not a whole lot of work to do to get up and running, but 
    1818        there is a bit. Here's what you have to do: 
    1919    </p> 
    …… 
    5353</head> 
    5454<body> 
    55     <h1>Elgg still isn't ready to run just yet. (Sorry.)</h1> 
     55    <h1>Elgg still is not ready to run just yet. (Sorry.)</h1> 
    5656    <p> 
    5757        You're going to need to rename the <i>htaccess-dist</i> file that 
    …… 
    104104    ****************************************************************************/ 
    105105 
     106     
     107    // Load setup.php which will initialize database connections and such like. 
     108        require_once($CFG->dirroot.'lib/setup.php'); 
     109 
    106110    // Language / internationalisation 
    107111    //@todo All the libraries has a strong dependence with this 'plugin' 
    108112        require_once($CFG->dirroot . "mod/gettext/lib.php"); 
    109113 
    110     // Load setup.php which will initialize database connections and such like. 
    111         require_once($CFG->dirroot.'lib/setup.php'); 
    112114 
    113115    // Plug-in engine (must be loaded first) 

  • devel/lib/elgglib.php

    r1514 r1527  
    34013401    if((!empty($_COOKIE[AUTH_COOKIE])) && $ticket = md5($_COOKIE[AUTH_COOKIE])) { 
    34023402        if ($user = get_record('users','code',$ticket)) { 
    3403             $USER = $user; 
     3403            $user = (array) $user; 
     3404            foreach ($user as $attr => $val){ 
     3405                $USER->$attr = $val; 
     3406            } 
    34043407             
    34053408            /*** TODO: Create Proper Abstraction Interface - don't use file binding -- ugh ***/