Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

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

Merged
merged 1 commit into from almost 2 years ago

3 participants

Victor Nagy Callum Macrae Andreas Fischer
Victor Nagy

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))
  2249
+?>
1

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
Callum Macrae

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

Andreas Fischer
Collaborator
bantu commented April 14, 2012

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

Victor Nagy

Sorry, it should be fixed now I hope

Callum Macrae

Looks good now.

Andreas Fischer
Collaborator
bantu commented April 19, 2012

Please replace lines containing tabs only with empty lines.

Victor Nagy [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
Victor Nagy

Should be fixed now

Andreas Fischer bantu merged commit edf60bc into from April 20, 2012
Andreas Fischer bantu closed this April 20, 2012
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Showing 1 unique commit by 1 author.

Apr 20, 2012
Victor Nagy [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
This page is out of date. Refresh to see the latest.

Showing 1 changed file with 19 additions and 16 deletions. Show diff stats Hide diff stats

  1. 35  phpBB/install/install_install.php
35  phpBB/install/install_install.php
@@ -166,25 +166,28 @@ function check_server_requirements($mode, $sub)
166 166
 			'S_LEGEND'		=> false,
167 167
 		));
168 168
 
169  
-		// Check for register_globals being enabled
170  
-		if (@ini_get('register_globals') == '1' || strtolower(@ini_get('register_globals')) == 'on')
  169
+		// Don't check for register_globals on 5.4+
  170
+		if (version_compare($php_version, '5.4.0-dev') < 0)
171 171
 		{
172  
-			$result = '<strong style="color:red">' . $lang['NO'] . '</strong>';
173  
-		}
174  
-		else
175  
-		{
176  
-			$result = '<strong style="color:green">' . $lang['YES'] . '</strong>';
177  
-		}
178  
-
179  
-		$template->assign_block_vars('checks', array(
180  
-			'TITLE'			=> $lang['PHP_REGISTER_GLOBALS'],
181  
-			'TITLE_EXPLAIN'	=> $lang['PHP_REGISTER_GLOBALS_EXPLAIN'],
182  
-			'RESULT'		=> $result,
  172
+			// Check for register_globals being enabled
  173
+			if (@ini_get('register_globals') == '1' || strtolower(@ini_get('register_globals')) == 'on')
  174
+			{
  175
+				$result = '<strong style="color:red">' . $lang['NO'] . '</strong>';
  176
+			}
  177
+			else
  178
+			{
  179
+				$result = '<strong style="color:green">' . $lang['YES'] . '</strong>';
  180
+			}
183 181
 
184  
-			'S_EXPLAIN'		=> true,
185  
-			'S_LEGEND'		=> false,
186  
-		));
  182
+			$template->assign_block_vars('checks', array(
  183
+				'TITLE'			=> $lang['PHP_REGISTER_GLOBALS'],
  184
+				'TITLE_EXPLAIN'	=> $lang['PHP_REGISTER_GLOBALS_EXPLAIN'],
  185
+				'RESULT'		=> $result,
187 186
 
  187
+				'S_EXPLAIN'		=> true,
  188
+				'S_LEGEND'		=> false,
  189
+			));
  190
+		}
188 191
 
189 192
 		// Check for url_fopen
190 193
 		if (@ini_get('allow_url_fopen') == '1' || strtolower(@ini_get('allow_url_fopen')) == 'on')
Commit_comment_tip

Tip: You can add notes to lines in a file. Hover to the left of a line to make a note

Something went wrong with that request. Please try again.