diff options
| author | Graham Eames <grahamje@users.sourceforge.net> | 2006-06-18 11:55:45 +0000 |
|---|---|---|
| committer | Graham Eames <grahamje@users.sourceforge.net> | 2006-06-18 11:55:45 +0000 |
| commit | f9f10be464369053a505b5c4c1de9e29f38247b2 (patch) | |
| tree | 2a0ba7102ef084b6acf02a96da19b75febb2e026 /phpBB/install/install_install.php | |
| parent | 6cf4180bb7ce73c344477730388a339e6a8e9fdb (diff) | |
| download | forums-f9f10be464369053a505b5c4c1de9e29f38247b2.tar forums-f9f10be464369053a505b5c4c1de9e29f38247b2.tar.gz forums-f9f10be464369053a505b5c4c1de9e29f38247b2.tar.bz2 forums-f9f10be464369053a505b5c4c1de9e29f38247b2.tar.xz forums-f9f10be464369053a505b5c4c1de9e29f38247b2.zip | |
Misc installation bugs
git-svn-id: file:///svn/phpbb/trunk@6095 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/install/install_install.php')
| -rwxr-xr-x | phpBB/install/install_install.php | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index bdd718ab1a..1e525bc179 100755 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -836,8 +836,8 @@ class install_install extends module $server_name = ($server_name !== '') ? $server_name : ((!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : getenv('SERVER_NAME')); $server_port = ($server_port !== '') ? $server_port : ((!empty($_SERVER['SERVER_PORT'])) ? (int) $_SERVER['SERVER_PORT'] : (int) getenv('SERVER_PORT')); - $server_protocol = ($server_protocol !== '') ? $server_protocol : (isset($_SERVER['HTTPS']) ? 'https://' : 'http://'); - $cookie_secure = ($cookie_secure !== '') ? $cookie_secure : (isset($_SERVER['HTTPS']) ? true : false); + $server_protocol = ($server_protocol !== '') ? $server_protocol : (isset($_SERVER['HTTPS'] && $_SERVER['HTTPS'] == 'on') ? 'https://' : 'http://'); + $cookie_secure = ($cookie_secure !== '') ? $cookie_secure : (isset($_SERVER['HTTPS'] && $_SERVER['HTTPS'] == 'on') ? true : false); foreach ($this->advanced_config_options as $config_key => $vars) @@ -1315,9 +1315,8 @@ class install_install extends module $sql = 'SELECT * FROM ' . MODULES_TABLE . " WHERE module_langname = '$mod_name' AND module_class = '$module_class' - AND module_name <> '' - LIMIT 1"; - $result = $db->sql_query($sql); + AND module_name <> ''"; + $result = $db->sql_query_limit($sql, 1); $module_data = $db->sql_fetchrow($result); $db->sql_freeresult($result); |