aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Atkinson <thefinn@users.sourceforge.net>2001-11-01 10:42:06 +0000
committerJames Atkinson <thefinn@users.sourceforge.net>2001-11-01 10:42:06 +0000
commitbd54224f2a6f2abda9f2a234cd3a3a1fa5802217 (patch)
treeb6407763ddb138d571c40f393eea6bd3d32e8cc4
parent5cce2b35f7dcb8517935507b5e6b6ee4fa9239b7 (diff)
downloadforums-bd54224f2a6f2abda9f2a234cd3a3a1fa5802217.tar
forums-bd54224f2a6f2abda9f2a234cd3a3a1fa5802217.tar.gz
forums-bd54224f2a6f2abda9f2a234cd3a3a1fa5802217.tar.bz2
forums-bd54224f2a6f2abda9f2a234cd3a3a1fa5802217.tar.xz
forums-bd54224f2a6f2abda9f2a234cd3a3a1fa5802217.zip
Fixed little bug that would leave slashes in the config file if magic_quotes_gpc was off
See this topic for more info: http://area51.phpbb.com/phpBB2/viewtopic.php?p=9797#9797 git-svn-id: file:///svn/phpbb/trunk@1252 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r--phpBB/install.php10
1 files changed, 6 insertions, 4 deletions
diff --git a/phpBB/install.php b/phpBB/install.php
index 08076d00cf..da5df793b5 100644
--- a/phpBB/install.php
+++ b/phpBB/install.php
@@ -252,10 +252,12 @@ else if( !empty($HTTP_POST_VARS['ftp_file']) )
//
// Here we'll actually send the file...
//
- if ( get_magic_quotes_gpc() )
- {
- $HTTP_POST_VARS['config_data'] = stripslashes($HTTP_POST_VARS['config_data']);
- }
+ // We need to stripslashes no matter what the setting of magic_quotes_gpc is
+ // because we add slahes at the top if its off, and they are added automaticlly
+ // if it is on.
+ //
+ $HTTP_POST_VARS['config_data'] = stripslashes($HTTP_POST_VARS['config_data']);
+
$conn_id = ftp_connect('localhost');
$login_result = ftp_login($conn_id, "$ftp_user", "$ftp_pass");
if( (!$conn_id) || (!$login_result) )