Ticket #252: translation.diff

File translation.diff, 1.8 kB (added by ewout, 7 months ago)

Yet another try...

  • includes.php

    old new  
    5252    <title>Elgg installation</title> 
    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 
    5858        came with your installation (it's in the main installation directory) 
    …… 
    103103    *    CORE FUNCTIONALITY LIBRARIES 
    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) 
    114116        require($CFG->dirroot . "lib/engine.php"); 

  • lib/elgglib.php

    old new  
    34003400    global $USER; 
    34013401    if((!empty($_COOKIE[AUTH_COOKIE])) && $ticket = md5($_COOKIE[AUTH_COOKIE])) { 
    34023402        if ($user = get_record('users','code',$ticket)) { 
    3403             $USER = $user; 
     3403            if(!isset($USER)) 
     3404              $USER = $user; 
    34043405             
    34053406            /*** TODO: Create Proper Abstraction Interface - don't use file binding -- ugh ***/ 
    34063407            if (!user_flag_get("banned",$USER->ident)) {