Changeset 614

Show
Ignore:
Timestamp:
10/31/06 20:33:01 (2 years ago)
Author:
Rickard
Message:

Always call pun_unregister_globals() and return directly only if we're sure register_globals is off.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/punbb-1.3-dev/upload/include/common.php

    r576 r614  
    3838 
    3939// Reverse the effect of register_globals 
    40 if (@ini_get('register_globals')) 
    41         pun_unregister_globals(); 
     40pun_unregister_globals(); 
    4241 
    4342 

  • branches/punbb-1.3-dev/upload/include/functions.php

    r613 r614  
    10321032function pun_unregister_globals() 
    10331033{ 
     1034        $register_globals = @ini_get('register_globals'); 
     1035        if ($register_globals === "" || $register_globals === "0" || strtolower($register_globals === "off")) 
     1036                return; 
     1037         
    10341038        // Prevent script.php?GLOBALS[foo]=bar 
    10351039        if (isset($_REQUEST['GLOBALS']) || isset($_FILES['GLOBALS']))