aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions.php
diff options
context:
space:
mode:
authorNathan Guse <nathaniel.guse@gmail.com>2012-10-04 13:30:40 -0500
committerNathan Guse <nathaniel.guse@gmail.com>2012-10-04 13:30:40 -0500
commit1aa5c005cb560dfea0ab0b35839a8b354b24e4a4 (patch)
treeb2c3c58236ce0136bb503b6622728f63f6e8531c /phpBB/includes/functions.php
parent25b9ea24bfb75d62b01e2f7aceaaef100830b5a3 (diff)
parentfca08119433f319c8035a90a4bf0a9dd25adc20b (diff)
downloadforums-1aa5c005cb560dfea0ab0b35839a8b354b24e4a4.tar
forums-1aa5c005cb560dfea0ab0b35839a8b354b24e4a4.tar.gz
forums-1aa5c005cb560dfea0ab0b35839a8b354b24e4a4.tar.bz2
forums-1aa5c005cb560dfea0ab0b35839a8b354b24e4a4.tar.xz
forums-1aa5c005cb560dfea0ab0b35839a8b354b24e4a4.zip
Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103
Diffstat (limited to 'phpBB/includes/functions.php')
-rw-r--r--phpBB/includes/functions.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 92d72b6636..162b0046b5 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -4175,7 +4175,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>&reg; Forum Software &copy; phpBB Group';
+ echo ' Powered by <a href="https://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Group';
echo ' </div>';
echo '</div>';
echo '</body>';
@@ -5211,7 +5211,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>&reg; Forum Software &copy; phpBB Group'),
+ 'CREDIT_LINE' => $user->lang('POWERED_BY', '<a href="https://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; 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) : '')
);