Update phpBB to 3.0.9
authorJesper Kristensen <mail@jesperkristensen.dk>
Wed, 10 Aug 2011 17:11:01 +0200
changeset 294 80c040af88ba
parent 293 5a26a0827fc2
child 295 cd8a2263bf4a
push id142
push usermail@jesperkristensen.dk
push date2011-08-10 15:12 +0000
Update phpBB to 3.0.9
phpbb/INSTALL
phpbb/theme/mcs/template/attachment.html
phpbb/theme/mcs/template/login_body.html
phpbb/theme/mcs/template/mcp_topic.html
phpbb/theme/mcs/template/memberlist_im.html
phpbb/theme/mcs/template/overall_footer.html
phpbb/theme/mcs/template/overall_header.html
phpbb/theme/mcs/template/posting_buttons.html
phpbb/theme/mcs/template/posting_smilies.html
phpbb/theme/mcs/template/simple_footer.html
phpbb/theme/mcs/template/simple_header.html
phpbb/theme/mcs/template/ucp_pm_viewmessage_print.html
phpbb/theme/mcs/template/viewtopic_body.html
phpbb/theme/mcs/template/viewtopic_print.html
--- a/phpbb/INSTALL
+++ b/phpbb/INSTALL
@@ -1,13 +1,13 @@
 Installation steps for developing the theme. Sets up phpBB to not interfere with HG.
 
 1) Install phpBB 3.0.x
   * Install in <mcs-hg-clone>/phpbb/board/
-  * Theme currently matches phpBB 3.0.8
+  * Theme currently matches phpBB 3.0.9
   * svn co http://code.phpbb.com/svn/phpbb/branches/phpBB-3_0_0/phpBB
   * Follow setup instructions
 
 2) Set up the theme
   * Copy from <mcs-hg-clone>/phpbb/theme/mcs to <mcs-hg-clone>/phpbb/board/styles/mcs
   * Install mcs theme using phpBB's Admin Control Panel
   * In phpmyadmin or similar: Change phpbb_styles_imageset.imageset_path, phpbb_styles_template.template_path and phpbb_styles_theme.theme_path from mcs to ../../theme/mcs
   * In includes/session.php remove "rawurlencode" near line 2189 in the img function (leave its parameter in place)
--- a/phpbb/theme/mcs/template/attachment.html
+++ b/phpbb/theme/mcs/template/attachment.html
@@ -65,22 +65,22 @@
 				<param name="play" value="true" />
 				<param name="loop" value="true" />
 				<param name="quality" value="high" />
 				<param name="allowScriptAccess" value="never" />
 				<param name="allowNetworking" value="internal" />
 				<embed src="{_file.U_VIEW_LINK}" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash" width="{_file.WIDTH}" height="{_file.HEIGHT}" play="true" loop="true" quality="high" allowscriptaccess="never" allownetworking="internal"></embed>
 			</object>
 		<!-- ELSEIF _file.S_QUICKTIME_FILE -->
-			<object id="qtstream_{_file.ATTACH_ID}" classid="clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B" codebase="http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0" width="0" height="16">
+			<object id="qtstream_{_file.ATTACH_ID}" classid="clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B" codebase="http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0" width="320" height="285">
 				<param name="src" value="{_file.U_DOWNLOAD_LINK}" />
 				<param name="controller" value="true" />
 				<param name="autoplay" value="false" />
 				<param name="type" value="video/quicktime" />
-				<embed name="qtstream_{_file.ATTACH_ID}" src="{_file.U_DOWNLOAD_LINK}" pluginspage="http://www.apple.com/quicktime/download/" enablejavascript="true" controller="true" width="0" height="16" type="video/quicktime" autoplay="false"></embed>
+				<embed name="qtstream_{_file.ATTACH_ID}" src="{_file.U_DOWNLOAD_LINK}" pluginspage="http://www.apple.com/quicktime/download/" enablejavascript="true" controller="true" width="320" height="285" type="video/quicktime" autoplay="false"></embed>
 			</object>
 		<!-- ELSEIF _file.S_RM_FILE -->
 			<object id="rmstream_{_file.ATTACH_ID}" classid="clsid:CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA" width="200" height="50">
 				<param name="src" value="{_file.U_DOWNLOAD_LINK}" />
 				<param name="autostart" value="false" />
 				<param name="controls" value="ImageWindow" />
 				<param name="console" value="ctrls_{_file.ATTACH_ID}" />
 				<param name="prefetch" value="false" />
--- a/phpbb/theme/mcs/template/login_body.html
+++ b/phpbb/theme/mcs/template/login_body.html
@@ -19,17 +19,17 @@
 		<!-- IF S_DISPLAY_FULL_LOGIN -->
 			<!-- IF S_AUTOLOGIN_ENABLED --><div><label for="autologin"><input type="checkbox" name="autologin" id="autologin" tabindex="4" /> {L_LOG_ME_IN}</label></div><!-- ENDIF -->
 			<div><label for="viewonline"><input type="checkbox" name="viewonline" id="viewonline" tabindex="5" /> {L_HIDE_ME}</label></div>
 		<!-- ENDIF -->
 </div>
 
 <script type="text/javascript">
 // <![CDATA[
-	document.getElementById("{USERNAME_CREDENTIAL}").focus();
+	document.getElementById("<!-- IF S_ADMIN_AUTH -->{PASSWORD_CREDENTIAL}<!-- ELSE -->{USERNAME_CREDENTIAL}<!-- ENDIF -->").focus();
 // ]]>
 </script>
 
 		<div>{S_LOGIN_REDIRECT}{S_HIDDEN_FIELDS}<input type="submit" name="login" tabindex="6" value="{L_LOGIN}" /></div>
 
 		<!-- IF S_DISPLAY_FULL_LOGIN and (U_SEND_PASSWORD or U_RESEND_ACTIVATION or S_ADMIN_AUTH) -->
 			<div class="panel"><ul class="linklist">
 				<!-- IF U_SEND_PASSWORD --><li><a href="{U_SEND_PASSWORD}">{L_FORGOT_PASS}</a></li><!-- ENDIF -->
--- a/phpbb/theme/mcs/template/mcp_topic.html
+++ b/phpbb/theme/mcs/template/mcp_topic.html
@@ -22,17 +22,17 @@ window.onload = subPanels;
 	<ul id="minitabs" class="tabs">
 		<li id="display-panel-tab"<!-- IF not S_MERGE_VIEW --> class="activetab"<!-- ENDIF -->>
 			<a href="#minitabs" onclick="subPanels('display-panel'); return false;">{L_DISPLAY_OPTIONS}</a>
 		</li>
 		<li id="split-panel-tab">
 			<a href="#minitabs" onclick="subPanels('split-panel'); return false;">{L_SPLIT_TOPIC}</a>
 		</li>
 		<li id="merge-panel-tab"<!-- IF S_MERGE_VIEW --> class="activetab"<!-- ENDIF -->>
-			<a href="#minitabs" onclick="subPanels('merge-panel'); return false;">{L_MERGE_TOPIC}</a>
+			<a href="#minitabs" onclick="subPanels('merge-panel'); return false;">{L_MERGE_POSTS}</a>
 		</li>
 	</ul>
 
 <form id="mcp" method="post" action="{S_MCP_ACTION}">
 
 <div class="tabcontent mcp-topic-tabs">
 
 	<div id="display-panel" class="panel">
--- a/phpbb/theme/mcs/template/memberlist_im.html
+++ b/phpbb/theme/mcs/template/memberlist_im.html
@@ -33,17 +33,17 @@
 		<input type="hidden" name="to" value="{IM_CONTACT}" />
 	<!-- ENDIF -->
 
 	<!-- IF S_SEND_AIM -->
 		<dl>
 			<dt></dt>
 			<dd><a href="{U_AIM_CONTACT}">{L_IM_ADD_CONTACT}</a></dd>
 			<dd><a href="{U_AIM_MESSAGE}">{L_IM_SEND_MESSAGE}</a></dd>
-			<dd><a href="http://www.aim.com/download.adp">{L_IM_DOWNLOAD_APP}</a> | <a href="http://aimexpress.oscar.aol.com/aimexpress/launch.adp?Brand=AIM">{L_IM_AIM_EXPRESS}</a></dd>
+			<dd><a href="http://www.aim.com">{L_IM_DOWNLOAD_APP}</a> | <a href="http://www.aim.com/products/express">{L_IM_AIM_EXPRESS}</a></dd>
 		</dl>
 	<!-- ENDIF -->
 
 	<!-- IF S_SEND_MSNM -->
 		<dl>
 			<dt></dt>
 			<dd><object classid="clsid:B69003B3-C55E-4B48-836C-BC5946FC3B28" codetype="application/x-oleobject" id="objMessengerApp" width="0" height="0"></object></dd>
 			<dd><a href="#" onclick="add_contact('{A_IM_CONTACT}'); return false;">{L_IM_ADD_CONTACT}</a></dd>
--- a/phpbb/theme/mcs/template/overall_footer.html
+++ b/phpbb/theme/mcs/template/overall_footer.html
@@ -24,20 +24,20 @@
 		<li><a href="{U_SEARCH_UNREAD}">{L_SEARCH_UNREAD}</a></li>
 		<!-- ENDIF -->
 		<!-- IF S_USER_LOGGED_IN -->
 		<li><a href="{U_SEARCH_NEW}">{L_SEARCH_NEW}</a></li>
 		<!-- ENDIF -->
 		<li><a href="{U_SEARCH_ACTIVE_TOPICS}">{L_SEARCH_ACTIVE_TOPICS}</a></li>
 		<!-- IF not S_IS_BOT and S_USER_LOGGED_IN --><li><a href="{U_SEARCH_SELF}">{L_SEARCH_SELF}</a></li><!-- ENDIF -->
 	<!-- ENDIF -->
-	<!-- IF not S_IS_BOT and U_MARK_FORUMS --><li class="rightside"><a href="{U_MARK_FORUMS}" accesskey="m">{L_MARK_FORUMS_READ}</a></li><!-- ENDIF -->
+	<!-- IF not S_IS_BOT and U_MARK_FORUMS --><li class="rightside"><a href="{U_MARK_FORUMS}" accesskey="m">{L_MARK_SUBFORUMS_READ}</a></li><!-- ENDIF -->
 <!-- ENDIF -->
 <!-- IF $MARKFORUMS -->
-	<li><a href="{U_MARK_FORUMS}">{L_MARK_FORUMS_READ}</a></li>
+	<li><a href="{U_MARK_FORUMS}">{L_MARK_SUBFORUMS_READ}</a></li>
 <!-- ENDIF -->
 				</ul>
 			</div>
 		</div>
 	</div>
 	<div id="footer">
 		<div class="doc">
 			<div class="navbar">
@@ -47,28 +47,17 @@
 					<li><a href="{U_FAQ}" title="{L_FAQ_EXPLAIN}">{L_FAQ}</a></li>
 					<!-- IF not S_IS_BOT and S_DISPLAY_MEMBERLIST --><li><a href="{U_MEMBERLIST}" title="{L_MEMBERLIST_EXPLAIN}">{L_MEMBERLIST}</a></li><!-- ENDIF -->
 					<!-- IF not S_IS_BOT --><li><a href="{U_DELETE_COOKIES}">{L_DELETE_COOKIES}</a></li><!-- ENDIF -->
 					<li>{S_TIMEZONE}</li>
 				</ul>
 		
 			</div>
 			
-		<!--
-			We request you retain the full copyright notice below including the link to www.phpbb.com.
-			This not only gives respect to the large amount of time given freely by the developers
-			but also helps build interest, traffic and use of phpBB3. If you (honestly) cannot retain
-			the full copyright we ask you at least leave in place the "Powered by phpBB" line, with
-			"phpBB" linked to www.phpbb.com. If you refuse to include even this then support on our
-			forums may be affected.
-		
-			The phpBB Group : 2006
-		//-->
-		
-			<div class="copyright">Powered by <a href="http://www.phpbb.com/">phpBB</a> &copy; 2000, 2002, 2005, 2007 phpBB Group
+			<div class="copyright">Powered by <a href="http://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Group
 				<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
 				<!-- IF DEBUG_OUTPUT --><br />{DEBUG_OUTPUT}<!-- ENDIF -->
 				<!-- IF U_ACP --><br /><strong><a href="{U_ACP}">{L_ACP}</a></strong><!-- ENDIF -->
 			</div>
 			<!-- IF not S_IS_BOT -->{RUN_CRON_TASK}<!-- ENDIF -->
 		</div>
 	</div>
 <script type="text/javascript">hideSort()</script>
--- a/phpbb/theme/mcs/template/overall_header.html
+++ b/phpbb/theme/mcs/template/overall_header.html
@@ -52,17 +52,17 @@
 <script type="text/javascript">
 // <![CDATA[
 	var jump_page = '{LA_JUMP_PAGE}:';
 	var on_page = '{ON_PAGE}';
 	var per_page = '{PER_PAGE}';
 	var base_url = '{A_BASE_URL}';
 // ]]>
 </script>
-	<script type="text/javascript" src="{T_TEMPLATE_PATH}/forum_fn.js"></script>
+	<script type="text/javascript" src="{T_SUPER_TEMPLATE_PATH}/forum_fn.js"></script>
 </head>
 
 <body id="phpbb">
   <ul id="nav-access">
     <li><a href="#content">Skip to content</a></li>
   </ul>
   <div id="header-bar" class="header">
     <div class="doc">
@@ -70,17 +70,17 @@
         <img src="{T_THEME_PATH}/img/logo/dino.png" class="dino" alt="" />
         <img src="{T_THEME_PATH}/img/logo/mcs-logo-dark.png" class="mcs-logo-dark" alt="" />
         <img src="{T_THEME_PATH}/img/logo/mozilla.png" class="mozilla" alt="mozilla" />
         <span>community website</span>
       </div>
       <ul class="nav">
 				<!-- IF S_DISPLAY_SEARCH and not S_IN_SEARCH -->
 				<li id="hb-search-box">
-					<form action="{U_SEARCH}" method="post" id="search" onsubmit="var q=document.getElementById('hb-searchinput');if(q.value=='{LA_SEARCH_MINI}')q.value='';">
+					<form action="{U_SEARCH}" method="get" id="search" onsubmit="var q=document.getElementById('hb-searchinput');if(q.value=='{LA_SEARCH_MINI}')q.value='';">
 						<div>
 							<input name="keywords" id="hb-searchinput" type="text" maxlength="128" title="{L_SEARCH_KEYWORDS}" value="<!-- IF SEARCH_WORDS-->{SEARCH_WORDS}<!-- ELSE -->{L_SEARCH_MINI}<!-- ENDIF -->" onclick="if(this.value=='{LA_SEARCH_MINI}')this.value='';" onblur="if(this.value=='')this.value='{LA_SEARCH_MINI}';" /> 
 							<input id="hb-searchbutton" value="&#9658;" type="submit" />
 						</div>
 					</form>
 				</li>
 				<!-- ENDIF -->
 				<!-- IF not S_IS_BOT -->
--- a/phpbb/theme/mcs/template/posting_buttons.html
+++ b/phpbb/theme/mcs/template/posting_buttons.html
@@ -27,17 +27,17 @@
 		d: '{LA_BBCODE_D_HELP}'
 		<!-- BEGIN custom_tags -->
 			,cb_{custom_tags.BBCODE_ID}: '{custom_tags.A_BBCODE_HELPLINE}'
 		<!-- END custom_tags -->
 	}
 
 // ]]>
 </script>
-<script type="text/javascript" src="{T_TEMPLATE_PATH}/editor.js"></script>
+<script type="text/javascript" src="{T_SUPER_TEMPLATE_PATH}/editor.js"></script>
 
 <!-- IF S_BBCODE_ALLOWED -->
 <ul id="editor-toolbar">
 	<!-- IF S_SMILIES_ALLOWED and .smiley -->
 	<li><input type="button" onclick="showHideToolMenu('smiley-box'); return false;" value="{L_SMILIES}" />
 		<div id="smiley-box" class="toolbar-popup box color">
 			<!-- BEGIN smiley -->
 				<a href="#" onclick="insert_text('{smiley.A_SMILEY_CODE}', true); showHideToolMenu('smiley-box'); return false;"><img src="{smiley.SMILEY_IMG}" width="{smiley.SMILEY_WIDTH}" height="{smiley.SMILEY_HEIGHT}" alt="{smiley.SMILEY_CODE}" title="{smiley.SMILEY_DESC}" /></a>
--- a/phpbb/theme/mcs/template/posting_smilies.html
+++ b/phpbb/theme/mcs/template/posting_smilies.html
@@ -1,17 +1,17 @@
 <!-- INCLUDE simple_header.html -->
 
 <script type="text/javascript">
 // <![CDATA[
 	var form_name = 'postform';
 	var text_name = 'message';
 // ]]>
 </script>
-<script type="text/javascript" src="{T_TEMPLATE_PATH}/editor.js"></script>
+<script type="text/javascript" src="{T_SUPER_TEMPLATE_PATH}/editor.js"></script>
 
 <h1>{L_SMILIES}</h1>
 <div class="panel">
 		<!-- BEGIN smiley --> 
 			<a href="#" onclick="initInsertions(); insert_text('{smiley.A_SMILEY_CODE}', true, true); return false;"><img src="{smiley.SMILEY_IMG}" width="{smiley.SMILEY_WIDTH}" height="{smiley.SMILEY_HEIGHT}" alt="{smiley.SMILEY_CODE}" title="{smiley.SMILEY_DESC}" /></a> 
 		<!-- END smiley	-->
 </div>
 <div>{PAGINATION}</div>
--- a/phpbb/theme/mcs/template/simple_footer.html
+++ b/phpbb/theme/mcs/template/simple_footer.html
@@ -1,23 +1,12 @@
 <!--
 
 	</div>
-<!-*-
-	We request you retain the full copyright notice below including the link to www.phpbb.com.
-	This not only gives respect to the large amount of time given freely by the developers
-	but also helps build interest, traffic and use of phpBB3. If you (honestly) cannot retain
-	the full copyright we ask you at least leave in place the "Powered by phpBB" line, with
-	"phpBB" linked to www.phpbb.com. If you refuse to include even this then support on our
-	forums may be affected.
-
-	The phpBB Group : 2006
-//-*->
-
-	<div class="copyright">Powered by <a href="http://www.phpbb.com/">phpBB</a> &copy; 2000, 2002, 2005, 2007 phpBB Group
+	<div class="copyright">Powered by <a href="http://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Group
 		<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
 		<!-- IF DEBUG_OUTPUT --><br />{DEBUG_OUTPUT}<!-- ENDIF -->
 	</div>
 </div>
 
 </body>
 </html>
 -->
--- a/phpbb/theme/mcs/template/simple_header.html
+++ b/phpbb/theme/mcs/template/simple_header.html
@@ -7,31 +7,30 @@
 <head>
 
 <meta http-equiv="content-type" content="text/html; charset={S_CONTENT_ENCODING}" />
 <meta http-equiv="content-style-type" content="text/css" />
 <meta http-equiv="content-language" content="{S_USER_LANG}" />
 <meta http-equiv="imagetoolbar" content="no" />
 <meta name="resource-type" content="document" />
 <meta name="distribution" content="global" />
-<meta name="copyright" content="2000, 2002, 2005, 2007 phpBB Group" />
 <meta name="keywords" content="" />
 <meta name="description" content="" />
 {META}
 <title>{SITENAME} &bull; <!-- IF S_IN_MCP -->{L_MCP} &bull; <!-- ELSEIF S_IN_UCP -->{L_UCP} &bull; <!-- ENDIF -->{PAGE_TITLE}</title>
 <script type="text/javascript">
 // <![CDATA[
 	var jump_page = '{LA_JUMP_PAGE}:';
 	var on_page = '{ON_PAGE}';
 	var per_page = '{PER_PAGE}';
 	var base_url = '{A_BASE_URL}';
 // ]]>
 </script>
 
-<script type="text/javascript" src="{T_TEMPLATE_PATH}/forum_fn.js"></script>
+<script type="text/javascript" src="{T_SUPER_TEMPLATE_PATH}/forum_fn.js"></script>
 
 <link href="{T_THEME_PATH}/print.css" rel="stylesheet" type="text/css" media="print" title="printonly" />
 <link href="{T_STYLESHEET_LINK}" rel="stylesheet" type="text/css" media="screen, projection" />
 
 <link href="{T_THEME_PATH}/normal.css" rel="alternate stylesheet" type="text/css" title="A" />
 <link href="{T_THEME_PATH}/medium.css" rel="alternate stylesheet" type="text/css" title="A+" />
 <link href="{T_THEME_PATH}/large.css" rel="alternate stylesheet" type="text/css" title="A++" />
 
--- a/phpbb/theme/mcs/template/ucp_pm_viewmessage_print.html
+++ b/phpbb/theme/mcs/template/ucp_pm_viewmessage_print.html
@@ -100,31 +100,21 @@ hr.sep	{
 	</tr>
 <!-- ENDIF -->
 <tr>
 	<td colspan="2"><hr class="sep" />{MESSAGE}</td>
 </tr>
 </table>
 
 <hr width="85%" />
-<!--
-	We request you retain the full copyright notice below including the link to www.phpbb.com.
-	This not only gives respect to the large amount of time given freely by the developers
-	but also helps build interest, traffic and use of phpBB3. If you (honestly) cannot retain
-	the full copyright we ask you at least leave in place the "Powered by phpBB" line, with
-	"phpBB" linked to www.phpbb.com. If you refuse to include even this then support on our
-	forums may be affected.
-
-	The phpBB Group : 2006
-//-->
 
 <table width="85%" cellspacing="3" cellpadding="0" border="0" align="center">
 <tr>
 	<td><span class="gensmall">{PAGE_NUMBER}</span></td>
 	<td align="{S_CONTENT_FLOW_END}"><span class="gensmall">{S_TIMEZONE}</span></td>
 </tr>
 <tr>
-	<td colspan="2" align="center"><span class="gensmall">Powered by phpBB &copy; 2000, 2002, 2005, 2007 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 />http://www.phpbb.com/</span></td>
 </tr>
 </table>
 
 </body>
 </html>
\ No newline at end of file
--- a/phpbb/theme/mcs/template/viewtopic_body.html
+++ b/phpbb/theme/mcs/template/viewtopic_body.html
@@ -20,22 +20,21 @@
 		<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="image-button">{L_PREVIOUS}</a><!-- ENDIF -->
 	<!-- IF not S_IS_BOT and S_DISPLAY_REPLY_INFO -->
 		<a href="{U_POST_REPLY_TOPIC}" title="<!-- IF S_IS_LOCKED -->{L_TOPIC_LOCKED}<!-- ELSE -->{L_POST_REPLY}<!-- ENDIF -->"<!-- IF not S_IS_LOCKED --> class="image-button"<!-- ENDIF -->><!-- IF S_IS_LOCKED -->{L_TOPIC_LOCKED_SHORT}<!-- ELSE -->{L_POST_REPLY}<!-- ENDIF --></a>
 	<!-- ENDIF -->
 	</div>
 
 	<!-- IF S_DISPLAY_SEARCHBOX -->
 		<div class="search-box">
-			<form method="post" id="topic-search" action="{S_SEARCHBOX_ACTION}">
+			<form method="get" id="topic-search" action="{S_SEARCHBOX_ACTION}">
 			<fieldset>
 				<input  type="text" name="keywords" id="search_keywords" size="20" value="{L_SEARCH_TOPIC}" onclick="if(this.value=='{LA_SEARCH_TOPIC}')this.value='';" onblur="if(this.value=='')this.value='{LA_SEARCH_TOPIC}';" />
 				<input type="submit" value="{L_SEARCH}" />
-				<input type="hidden" value="{TOPIC_ID}" name="t" />
-				<input type="hidden" value="msgonly" name="sf" />
+				{S_SEARCH_LOCAL_HIDDEN_FIELDS}
 			</fieldset>
 			</form>
 		</div>
 	<!-- ENDIF -->
 
 <!-- IF S_FORUM_RULES and U_FORUM_RULES -->
 	<div class="other"><a href="{U_FORUM_RULES}"><strong>{L_FORUM_RULES}</strong></a></div>
 <!-- ENDIF -->
--- a/phpbb/theme/mcs/template/viewtopic_print.html
+++ b/phpbb/theme/mcs/template/viewtopic_print.html
@@ -3,17 +3,16 @@
 <head>
 
 <meta http-equiv="content-type" content="text/html; charset={S_CONTENT_ENCODING}" />
 <meta http-equiv="content-style-type" content="text/css" />
 <meta http-equiv="content-language" content="{S_USER_LANG}" />
 <meta http-equiv="imagetoolbar" content="no" />
 <meta name="resource-type" content="document" />
 <meta name="distribution" content="global" />
-<meta name="copyright" content="2000, 2002, 2005, 2007 phpBB Group" />
 <meta name="keywords" content="" />
 <meta name="description" content="" />
 <meta name="robots" content="noindex" />
 {META}
 <title>{SITENAME} &bull; {PAGE_TITLE}</title>
 
 <link href="{T_THEME_PATH}/print.css" rel="stylesheet" type="text/css" />
 </head>
@@ -38,26 +37,16 @@
 				<div class="date">{postrow.MINI_POST_IMG}{L_POSTED}: <strong>{postrow.POST_DATE}</strong></div>
 				<div class="author">{L_POST_BY_AUTHOR} <strong>{postrow.POST_AUTHOR}</strong></div>
 				<div class="content">{postrow.MESSAGE}</div>
 			</div>
 			<hr />
 		<!-- END postrow -->
 	</div>
 
-<!--
-	We request you retain the full copyright notice below including the link to www.phpbb.com.
-	This not only gives respect to the large amount of time given freely by the developers
-	but also helps build interest, traffic and use of phpBB3. If you (honestly) cannot retain
-	the full copyright we ask you at least leave in place the "Powered by phpBB" line, with
-	"phpBB" linked to www.phpbb.com. If you refuse to include even this then support on our
-	forums may be affected.
-
-	The phpBB Group : 2006
-//-->
 	<div id="page-footer">
 		<div class="page-number">{S_TIMEZONE}<br />{PAGE_NUMBER}</div>
-		<div class="copyright">Powered by phpBB &copy; 2000, 2002, 2005, 2007 phpBB Group<br />http://www.phpbb.com/</div>
+		<div class="copyright">Powered by phpBB&reg; Forum Software &copy; phpBB Group<br />http://www.phpbb.com/</div>
 	</div>
 </div>
 
 </body>
 </html>
\ No newline at end of file