makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop-olympus' into develop

Browse source 
* develop-olympus:
  [ticket/11135] Full replacement of credit link to https

Conflicts:
	phpBB/install/convertors/convert_phpbb20.php
This commit is contained in:
Andreas Fischer 2012-10-06 06:15:01 +02:00
commit a38de9a232
10 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/adm/style/install_footer.html
View file

@ -8,7 +8,7 @@
</div> </div>
<div id="page-footer"> <div id="page-footer">
Powered by <a href="http://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Group Powered by <a href="https://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Group
</div> </div>
</div> </div>

2
phpBB/install/convertors/convert_phpbb20.php
View file

@ -32,7 +32,7 @@ $convertor_data = array(
'forum_name' => 'phpBB 2.0.x', 'forum_name' => 'phpBB 2.0.x',
'version' => '1.0.3', 'version' => '1.0.3',
'phpbb_version' => '3.1.0-dev', 'phpbb_version' => '3.1.0-dev',
'author' => '<a href="http://www.phpbb.com/">phpBB Group</a>', 'author' => '<a href="https://www.phpbb.com/">phpBB Group</a>',
'dbms' => $dbms, 'dbms' => $dbms,
'dbhost' => $dbhost, 'dbhost' => $dbhost,
'dbport' => $dbport, 'dbport' => $dbport,

2
phpBB/install/database_update.php
View file

@ -617,7 +617,7 @@ function _print_footer()
</div> </div>
<div id="page-footer"> <div id="page-footer">
Powered by <a href="http://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Group Powered by <a href="https://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Group
</div> </div>
</div> </div>

2
phpBB/install/index.php
View file

@ -594,7 +594,7 @@ class module
echo ' </div>'; echo ' </div>';
echo ' </div>'; echo ' </div>';
echo ' <div id="page-footer">'; 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 '</div>'; echo '</div>';
echo '</body>'; echo '</body>';

2
phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html
View file

@ -42,7 +42,7 @@
<div id="page-footer"> <div id="page-footer">
<div class="page-number">{S_TIMEZONE}<br />{PAGE_NUMBER}</div> <div class="page-number">{S_TIMEZONE}<br />{PAGE_NUMBER}</div>
<div class="copyright">Powered by phpBB&reg; Forum Software &copy; phpBB Group<br />http://www.phpbb.com/</div> <div class="copyright">Powered by phpBB&reg; Forum Software &copy; phpBB Group<br />https://www.phpbb.com/</div>
</div> </div>
</div> </div>

2
phpBB/styles/prosilver/template/viewtopic_print.html
View file

@ -38,7 +38,7 @@
<div id="page-footer"> <div id="page-footer">
<div class="page-number">{S_TIMEZONE}<br />{PAGE_NUMBER}</div> <div class="page-number">{S_TIMEZONE}<br />{PAGE_NUMBER}</div>
<div class="copyright">Powered by phpBB&reg; Forum Software &copy; phpBB Group<br />http://www.phpbb.com/</div> <div class="copyright">Powered by phpBB&reg; Forum Software &copy; phpBB Group<br />https://www.phpbb.com/</div>
</div> </div>
</div> </div>

2
phpBB/styles/prosilver/theme/stylesheet.css
View file

@ -3,7 +3,7 @@
Style name: prosilver (the default phpBB 3.1.x style) Style name: prosilver (the default phpBB 3.1.x style)
Based on style: Based on style:
Original author: Tom Beddard ( http://www.subblue.com/ ) Original author: Tom Beddard ( http://www.subblue.com/ )
Modified by: phpBB Group ( http://www.phpbb.com/ ) Modified by: phpBB Group ( https://www.phpbb.com/ )
-------------------------------------------------------------- --------------------------------------------------------------
*/ */

2
phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html
View file

@ -112,7 +112,7 @@ hr.sep {
<td align="{S_CONTENT_FLOW_END}"><span class="gensmall">{S_TIMEZONE}</span></td> <td align="{S_CONTENT_FLOW_END}"><span class="gensmall">{S_TIMEZONE}</span></td>
</tr> </tr>
<tr> <tr>
<td colspan="2" align="center"><span class="gensmall">Powered by phpBB&reg; Forum Software &copy; phpBB Group<br />http://www.phpbb.com/</span></td> <td colspan="2" align="center"><span class="gensmall">Powered by phpBB&reg; Forum Software &copy; phpBB Group<br />https://www.phpbb.com/</span></td>
</tr> </tr>
</table> </table>

2
phpBB/styles/subsilver2/template/viewtopic_print.html
View file

@ -126,7 +126,7 @@ hr.sep {
<td align="{S_CONTENT_FLOW_END}"><span class="gensmall">{S_TIMEZONE}</span></td> <td align="{S_CONTENT_FLOW_END}"><span class="gensmall">{S_TIMEZONE}</span></td>
</tr> </tr>
<tr> <tr>
<td colspan="2" align="center"><span class="gensmall">Powered by phpBB&reg; Forum Software &copy; phpBB Group<br />http://www.phpbb.com/</span></td> <td colspan="2" align="center"><span class="gensmall">Powered by phpBB&reg; Forum Software &copy; phpBB Group<br />https://www.phpbb.com/</span></td>
</tr> </tr>
</table> </table>

2
phpBB/styles/subsilver2/theme/stylesheet.css
View file

@ -3,7 +3,7 @@
Style name: subsilver2 Style name: subsilver2
Based on style: subSilver (the default phpBB 2.0.x style) Based on style: subSilver (the default phpBB 2.0.x style)
Original author: Tom Beddard ( http://www.subblue.com/ ) Original author: Tom Beddard ( http://www.subblue.com/ )
Modified by: phpBB Group ( http://www.phpbb.com/ ) Modified by: phpBB Group ( https://www.phpbb.com/ )
-------------------------------------------------------------- --------------------------------------------------------------
*/ */