diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-04-04 15:33:51 -0400 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-04-04 15:33:51 -0400 |
| commit | 7d6b289671c51694f17dd5f9849abf2534b55e59 (patch) | |
| tree | 5a7a841cdacae65ea59ab965dd9d718e9e62085e /phpBB/includes/functions.php | |
| parent | 714fafe106a1b30d299f2e29588c0d73d6ec44b5 (diff) | |
| parent | 21639d5d5481ac5457e3b38bb848671f8be7b07b (diff) | |
| download | forums-7d6b289671c51694f17dd5f9849abf2534b55e59.tar forums-7d6b289671c51694f17dd5f9849abf2534b55e59.tar.gz forums-7d6b289671c51694f17dd5f9849abf2534b55e59.tar.bz2 forums-7d6b289671c51694f17dd5f9849abf2534b55e59.tar.xz forums-7d6b289671c51694f17dd5f9849abf2534b55e59.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10607] Added 'Powered by' translation string.
Conflicts:
phpBB/adm/index.php
phpBB/language/en/common.php
Diffstat (limited to 'phpBB/includes/functions.php')
| -rw-r--r-- | phpBB/includes/functions.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index a44ebb04e8..9a6af29d69 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -4860,6 +4860,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'), 'U_ACP' => ($auth->acl_get('a_') && !empty($user->data['is_registered'])) ? append_sid("{$phpbb_root_path}adm/index.$phpEx", false, true, $user->session_id) : '') ); |