aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions.php
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2011-07-06 21:51:33 -0400
committerNils Adermann <naderman@naderman.de>2011-07-06 21:51:33 -0400
commitcf4e6d8a3eecce8b771005af8c9be92a08758f5f (patch)
treeafa7cc8a6a7fb8fa67b3edf4af81226958e2d529 /phpBB/includes/functions.php
parent5eeb870442e01b3949489107ca80c584b36ff4ac (diff)
parent02bba2384403d9ae0f8609786e263c511d495d82 (diff)
downloadforums-cf4e6d8a3eecce8b771005af8c9be92a08758f5f.tar
forums-cf4e6d8a3eecce8b771005af8c9be92a08758f5f.tar.gz
forums-cf4e6d8a3eecce8b771005af8c9be92a08758f5f.tar.bz2
forums-cf4e6d8a3eecce8b771005af8c9be92a08758f5f.tar.xz
forums-cf4e6d8a3eecce8b771005af8c9be92a08758f5f.zip
Merge branch 'prep-release-3.0.9' into develop-olympus
* prep-release-3.0.9: [ticket/9859] Changing all phpBB footers to match the new credit line [ticket/9859] New footer copyright line with registered symbol
Diffstat (limited to 'phpBB/includes/functions.php')
-rw-r--r--phpBB/includes/functions.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index d05cccc440..b1c1c14d0c 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -3851,7 +3851,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> &copy; phpBB Group';
+ echo ' Powered by <a href="http://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Group';
echo ' </div>';
echo '</div>';
echo '</body>';