Changeset 933

Show
Ignore:
Timestamp:
04/09/07 14:15:20 (1 year ago)
Author:
Rickard
Message:

Ported [614] from 1.3 branch.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/upload/include/common.php

    r285 r933  
    3838 
    3939// Reverse the effect of register_globals 
    40 if (@ini_get('register_globals')) 
    41         unregister_globals(); 
     40unregister_globals(); 
    4241 
    4342 

  • trunk/upload/include/functions.php

    r932 r933  
    10671067function unregister_globals() 
    10681068{ 
     1069        $register_globals = @ini_get('register_globals'); 
     1070        if ($register_globals === "" || $register_globals === "0" || strtolower($register_globals === "off")) 
     1071                return; 
     1072 
    10691073        // Prevent script.php?GLOBALS[foo]=bar 
    10701074        if (isset($_REQUEST['GLOBALS']) || isset($_FILES['GLOBALS']))