diff options
| author | Nils Adermann <naderman@naderman.de> | 2011-07-06 21:52:05 -0400 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2011-07-06 21:52:05 -0400 |
| commit | 3fb9b62c6921751ebc40b74612d5412648134a9e (patch) | |
| tree | caf87d98601f078e417e3c8e52209f5aec6309f5 /phpBB/includes | |
| parent | 7b2f88686b313aebb64b6c7dade50df6a6c859c6 (diff) | |
| parent | cf4e6d8a3eecce8b771005af8c9be92a08758f5f (diff) | |
| download | forums-3fb9b62c6921751ebc40b74612d5412648134a9e.tar forums-3fb9b62c6921751ebc40b74612d5412648134a9e.tar.gz forums-3fb9b62c6921751ebc40b74612d5412648134a9e.tar.bz2 forums-3fb9b62c6921751ebc40b74612d5412648134a9e.tar.xz forums-3fb9b62c6921751ebc40b74612d5412648134a9e.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[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')
| -rw-r--r-- | phpBB/includes/db/dbal.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/functions.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/db/dbal.php b/phpBB/includes/db/dbal.php index 82fd03b5f3..b29e2791ab 100644 --- a/phpBB/includes/db/dbal.php +++ b/phpBB/includes/db/dbal.php @@ -800,7 +800,7 @@ class dbal </div> </div> <div id="page-footer"> - Powered by <a href="http://www.phpbb.com/">phpBB</a> © phpBB Group + Powered by <a href="http://www.phpbb.com/">phpBB</a>® Forum Software © phpBB Group </div> </div> </body> diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index fda65017d3..ed183b3e76 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -3789,7 +3789,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> © phpBB Group'; + echo ' Powered by <a href="http://www.phpbb.com/">phpBB</a>® Forum Software © phpBB Group'; echo ' </div>'; echo '</div>'; echo '</body>'; |