Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

[ticket/10812] Installer should not display register globals UI for php 5.4+ #748

Merged
merged 1 commit into from

3 participants

@galaxyAbstractor

Made so the check for register_globals doesn't occur if php version is 5.4+ as register_globals is now removed

PHPBB3-10812

phpBB/install/install_install.php
((5 lines not shown))
+?>

Please re-remove this, it isn't related to the ticket.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
@callumacrae

Except for the change at the end of the file, this all looks good.

@bantu
Owner

Please change the commit message to follow http://wiki.phpbb.com/Git#Commit_Messages

@galaxyAbstractor

Sorry, it should be fixed now I hope

@callumacrae

Looks good now.

@bantu
Owner

Please replace lines containing tabs only with empty lines.

@galaxyAbstractor galaxyAbstractor [ticket/10812] Disabled register_globals check in PHP 5.4
Disabled the check for register_globals if PHP version is 5.4+

PHPBB3-10812
edf60bc
@galaxyAbstractor

Should be fixed now

@bantu bantu merged commit edf60bc into phpbb:develop-olympus
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Apr 20, 2012
  1. @galaxyAbstractor

    [ticket/10812] Disabled register_globals check in PHP 5.4

    galaxyAbstractor authored
    Disabled the check for register_globals if PHP version is 5.4+
    
    PHPBB3-10812
This page is out of date. Refresh to see the latest.
Showing with 19 additions and 16 deletions.
  1. +19 −16 phpBB/install/install_install.php
View
35 phpBB/install/install_install.php
@@ -166,25 +166,28 @@ function check_server_requirements($mode, $sub)
'S_LEGEND' => false,
));
- // Check for register_globals being enabled
- if (@ini_get('register_globals') == '1' || strtolower(@ini_get('register_globals')) == 'on')
+ // Don't check for register_globals on 5.4+
+ if (version_compare($php_version, '5.4.0-dev') < 0)
{
- $result = '<strong style="color:red">' . $lang['NO'] . '</strong>';
- }
- else
- {
- $result = '<strong style="color:green">' . $lang['YES'] . '</strong>';
- }
-
- $template->assign_block_vars('checks', array(
- 'TITLE' => $lang['PHP_REGISTER_GLOBALS'],
- 'TITLE_EXPLAIN' => $lang['PHP_REGISTER_GLOBALS_EXPLAIN'],
- 'RESULT' => $result,
+ // Check for register_globals being enabled
+ if (@ini_get('register_globals') == '1' || strtolower(@ini_get('register_globals')) == 'on')
+ {
+ $result = '<strong style="color:red">' . $lang['NO'] . '</strong>';
+ }
+ else
+ {
+ $result = '<strong style="color:green">' . $lang['YES'] . '</strong>';
+ }
- 'S_EXPLAIN' => true,
- 'S_LEGEND' => false,
- ));
+ $template->assign_block_vars('checks', array(
+ 'TITLE' => $lang['PHP_REGISTER_GLOBALS'],
+ 'TITLE_EXPLAIN' => $lang['PHP_REGISTER_GLOBALS_EXPLAIN'],
+ 'RESULT' => $result,
+ 'S_EXPLAIN' => true,
+ 'S_LEGEND' => false,
+ ));
+ }
// Check for url_fopen
if (@ini_get('allow_url_fopen') == '1' || strtolower(@ini_get('allow_url_fopen')) == 'on')
Something went wrong with that request. Please try again.