diff options
| author | Graham Eames <grahamje@users.sourceforge.net> | 2006-06-18 14:56:17 +0000 |
|---|---|---|
| committer | Graham Eames <grahamje@users.sourceforge.net> | 2006-06-18 14:56:17 +0000 |
| commit | bd3c8c50c01ec0344fec1c5a1cef2cf83c4c4ca7 (patch) | |
| tree | d7117ed789cb9c2c1458d442432ca663a43e84c4 /phpBB/install | |
| parent | d3b8612402006e7dc0a2cbf60ea406ec34294b7e (diff) | |
| download | forums-bd3c8c50c01ec0344fec1c5a1cef2cf83c4c4ca7.tar forums-bd3c8c50c01ec0344fec1c5a1cef2cf83c4c4ca7.tar.gz forums-bd3c8c50c01ec0344fec1c5a1cef2cf83c4c4ca7.tar.bz2 forums-bd3c8c50c01ec0344fec1c5a1cef2cf83c4c4ca7.tar.xz forums-bd3c8c50c01ec0344fec1c5a1cef2cf83c4c4ca7.zip | |
This fixes a consistancy issue re the ISO language code on install, but there's still a bigger issue related to thsi to look at
git-svn-id: file:///svn/phpbb/trunk@6097 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/install')
| -rwxr-xr-x | phpBB/install/install_install.php | 4 | ||||
| -rw-r--r-- | phpBB/install/schemas/schema_data.sql | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index e5c91a04eb..c7f442a65b 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']) && $_SERVER['HTTPS'] == 'on') ? 'https://' : 'http://'); - $cookie_secure = ($cookie_secure !== '') ? $cookie_secure : (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 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) diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 4c3fc036d9..80901a23b8 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -390,7 +390,7 @@ INSERT INTO phpbb_styles_template (template_name, template_copyright, template_p INSERT INTO phpbb_styles_theme (theme_name, theme_copyright, theme_path, theme_data) VALUES ('subSilver', '© phpBB Group', 'subSilver', ''); # -- Language -INSERT INTO phpbb_lang (lang_iso, lang_dir, lang_english_name, lang_local_name, lang_author) VALUES ('en', 'en', 'English [ UK ]', 'English [ UK ]', 'phpBB Group'); +INSERT INTO phpbb_lang (lang_iso, lang_dir, lang_english_name, lang_local_name, lang_author) VALUES ('en', 'en', 'English [ GB ]', 'English [ GB ]', 'phpBB Group'); # -- Forums INSERT INTO phpbb_forums (forum_name, forum_desc, left_id, right_id, parent_id, forum_type, forum_posts, forum_topics, forum_topics_real, forum_last_post_id, forum_last_poster_id, forum_last_poster_name, forum_last_post_time, forum_link, forum_password, forum_image, forum_rules, forum_rules_link, forum_rules_uid, forum_desc_uid, prune_days, prune_viewed) VALUES ('My first Category', '', 1, 4, 0, 0, 1, 1, 1, 1, 2, 'Admin', 972086460, '', '', '', '', '', '', '', 0, 0); |