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_acp.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_acp.php')
| -rw-r--r-- | phpBB/includes/functions_acp.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions_acp.php b/phpBB/includes/functions_acp.php index 2f0188289b..11cc1f6dd8 100644 --- a/phpBB/includes/functions_acp.php +++ b/phpBB/includes/functions_acp.php @@ -172,7 +172,7 @@ function adm_page_footer($copyright_html = true) 'DEBUG_OUTPUT' => (defined('DEBUG')) ? $debug_output : '', 'TRANSLATION_INFO' => (!empty($user->lang['TRANSLATION_INFO'])) ? $user->lang['TRANSLATION_INFO'] : '', 'S_COPYRIGHT_HTML' => $copyright_html, - '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'), 'T_JQUERY_LINK' => ($config['load_jquery_cdn'] && !empty($config['load_jquery_url'])) ? $config['load_jquery_url'] : "{$phpbb_root_path}assets/javascript/jquery.js", 'S_JQUERY_FALLBACK' => ($config['load_jquery_cdn']) ? true : false, 'VERSION' => $config['version']) |