diff options
| author | Nils Adermann <naderman@naderman.de> | 2011-07-06 21:50:43 -0400 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2011-07-06 21:50:43 -0400 |
| commit | 02bba2384403d9ae0f8609786e263c511d495d82 (patch) | |
| tree | 33536796d21f2a1fd2b61995931a8d66c512bb5c /phpBB/includes | |
| parent | ca2d6a01f1cc93a0ffa5e9545bfeb257fcf643e1 (diff) | |
| parent | a275d17625325e0353b67fabf5a9b0c4fb35877e (diff) | |
| download | forums-02bba2384403d9ae0f8609786e263c511d495d82.tar forums-02bba2384403d9ae0f8609786e263c511d495d82.tar.gz forums-02bba2384403d9ae0f8609786e263c511d495d82.tar.bz2 forums-02bba2384403d9ae0f8609786e263c511d495d82.tar.xz forums-02bba2384403d9ae0f8609786e263c511d495d82.zip | |
Merge branch 'ticket/marshalrusty/9859' into prep-release-3.0.9
* ticket/marshalrusty/9859:
[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 2f9619c8ea..9b45c085a2 100644 --- a/phpBB/includes/db/dbal.php +++ b/phpBB/includes/db/dbal.php @@ -777,7 +777,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 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> © phpBB Group'; + echo ' Powered by <a href="http://www.phpbb.com/">phpBB</a>® Forum Software © phpBB Group'; echo ' </div>'; echo '</div>'; echo '</body>'; |