diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-10-02 17:03:06 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-10-02 17:03:06 +0200 |
| commit | fca08119433f319c8035a90a4bf0a9dd25adc20b (patch) | |
| tree | f8f9ba2032f36071119e8c74911b0ea22a27a2fe /phpBB/includes/functions.php | |
| parent | 0daab4e0ef772deec55699a967b5127cb9614d7e (diff) | |
| parent | 8428b530871f4f8e651fc19e68ea1949f3435fd7 (diff) | |
| download | forums-fca08119433f319c8035a90a4bf0a9dd25adc20b.tar forums-fca08119433f319c8035a90a4bf0a9dd25adc20b.tar.gz forums-fca08119433f319c8035a90a4bf0a9dd25adc20b.tar.bz2 forums-fca08119433f319c8035a90a4bf0a9dd25adc20b.tar.xz forums-fca08119433f319c8035a90a4bf0a9dd25adc20b.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/11112] updating links to phpbb.com to use SSL
Conflicts:
phpBB/adm/index.php
Diffstat (limited to 'phpBB/includes/functions.php')
| -rw-r--r-- | phpBB/includes/functions.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index ef26299829..2480ca80fa 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -4147,7 +4147,7 @@ function msg_handler($errno, $msg_text, $errfile, $errline) echo ' </div>'; echo ' </div>'; echo ' <div id="page-footer">'; - echo ' Powered by <a href="http://www.phpbb.com/">phpBB</a>® Forum Software © phpBB Group'; + echo ' Powered by <a href="https://www.phpbb.com/">phpBB</a>® Forum Software © phpBB Group'; echo ' </div>'; echo '</div>'; echo '</body>'; @@ -5170,7 +5170,7 @@ function page_footer($run_cron = true) $template->assign_vars(array( 'DEBUG_OUTPUT' => (defined('DEBUG')) ? $debug_output : '', 'TRANSLATION_INFO' => (!empty($user->lang['TRANSLATION_INFO'])) ? $user->lang['TRANSLATION_INFO'] : '', - 'CREDIT_LINE' => $user->lang('POWERED_BY', '<a href="http://www.phpbb.com/">phpBB</a>® Forum Software © phpBB Group'), + 'CREDIT_LINE' => $user->lang('POWERED_BY', '<a href="https://www.phpbb.com/">phpBB</a>® Forum Software © phpBB Group'), 'U_ACP' => ($auth->acl_get('a_') && !empty($user->data['is_registered'])) ? append_sid("{$phpbb_root_path}adm/index.$phpEx", false, true, $user->session_id) : '') ); |