diff options
33 files changed, 136 insertions, 111 deletions
diff --git a/phpBB/adm/style/install_update.html b/phpBB/adm/style/install_update.html index 22d21d8314..818889c89b 100644 --- a/phpBB/adm/style/install_update.html +++ b/phpBB/adm/style/install_update.html @@ -43,6 +43,11 @@  		<p>{WARNING_MSG}</p>  	</div>  	<!-- ENDIF --> +	 +	<div class="errorbox" style="margin-top: 0;"> +		<h3>{L_NOTICE}</h3> +		<p>{L_BACKUP_NOTICE}</p> +	</div>  	<form id="install_update" method="post" action="{U_ACTION}"> diff --git a/phpBB/download/file.php b/phpBB/download/file.php index c17f0cf018..bf277c69fa 100644 --- a/phpBB/download/file.php +++ b/phpBB/download/file.php @@ -424,7 +424,7 @@ function send_file_to_browser($attachment, $upload_dir, $category)  	if (!@file_exists($filename))  	{  		send_status_line(404, 'Not Found'); -		trigger_error($user->lang['ERROR_NO_ATTACHMENT'] . '<br /><br />' . sprintf($user->lang['FILE_NOT_FOUND_404'], $filename)); +		trigger_error('ERROR_NO_ATTACHMENT');  	}  	// Correct the mime type - we force application/octetstream for all files, except images diff --git a/phpBB/includes/acp/acp_ranks.php b/phpBB/includes/acp/acp_ranks.php index dfd7511427..ea057cd84c 100644 --- a/phpBB/includes/acp/acp_ranks.php +++ b/phpBB/includes/acp/acp_ranks.php @@ -52,7 +52,7 @@ class acp_ranks  				}  				$rank_title = utf8_normalize_nfc(request_var('title', '', true));  				$special_rank = request_var('special_rank', 0); -				$min_posts = ($special_rank) ? 0 : request_var('min_posts', 0); +				$min_posts = ($special_rank) ? 0 : max(0, request_var('min_posts', 0));  				$rank_image = request_var('rank_image', '');  				// The rank image has to be a jpg, gif or png diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php index 5a7902755e..d7b0484af8 100644 --- a/phpBB/includes/acp/acp_styles.php +++ b/phpBB/includes/acp/acp_styles.php @@ -99,11 +99,11 @@ parse_css_file = {PARSE_CSS_FILE}  		$this->template_cfg .= '  # Some configuration options -# -# You can use this function to inherit templates from another template. -# The template of the given name has to be installed. -# Templates cannot inherit from inheriting templates. -#'; +# Template inheritance +# See http://blog.phpbb.com/2008/07/31/templating-just-got-easier/ +# Set value to empty or this template name to ignore template inheritance. +inherit_from = {INHERIT_FROM} +';  		$this->imageset_keys = array(  			'logos' => array( @@ -2047,9 +2047,7 @@ parse_css_file = {PARSE_CSS_FILE}  			// Export template core code  			if ($mode == 'template' || $inc_template)  			{ -				$template_cfg = str_replace(array('{MODE}', '{NAME}', '{COPYRIGHT}', '{VERSION}'), array($mode, $style_row['template_name'], $style_row['template_copyright'], $config['version']), $this->template_cfg); - -				$use_template_name = ''; +				$use_template_name = $style_row['template_name'];  				// Add the inherit from variable, depending on it's use...  				if ($style_row['template_inherits_id']) @@ -2063,7 +2061,8 @@ parse_css_file = {PARSE_CSS_FILE}  					$db->sql_freeresult($result);  				} -				$template_cfg .= ($use_template_name) ? "\ninherit_from = $use_template_name" : "\n#inherit_from = "; +				$template_cfg = str_replace(array('{MODE}', '{NAME}', '{COPYRIGHT}', '{VERSION}', '{INHERIT_FROM}'), array($mode, $style_row['template_name'], $style_row['template_copyright'], $config['version'], $use_template_name), $this->template_cfg); +  				$template_cfg .= "\n\nbbcode_bitfield = {$style_row['bbcode_bitfield']}";  				$data[] = array( diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 1eefaee651..0320230a7d 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -3322,6 +3322,11 @@ function parse_cfg_file($filename, $lines = false)  		$parsed_items[$key] = $value;  	} +	 +	if (isset($parsed_items['inherit_from']) && isset($parsed_items['name']) && $parsed_items['inherit_from'] == $parsed_items['name']) +	{ +		unset($parsed_items['inherit_from']); +	}  	return $parsed_items;  } @@ -4548,7 +4553,7 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0  		foreach ($_EXTRA_URL as $url_param)  		{  			$url_param = explode('=', $url_param, 2); -			$s_hidden_fields[$url_param[0]] = $url_param[1]; +			$s_search_hidden_fields[$url_param[0]] = $url_param[1];  		}  	} diff --git a/phpBB/includes/search/fulltext_mysql.php b/phpBB/includes/search/fulltext_mysql.php index 29cdd8ee9a..52372a14d8 100644 --- a/phpBB/includes/search/fulltext_mysql.php +++ b/phpBB/includes/search/fulltext_mysql.php @@ -707,7 +707,7 @@ class fulltext_mysql extends search_backend  	*/  	function index_remove($post_ids, $author_ids, $forum_ids)  	{ -		$this->destroy_cache(array(), $author_ids); +		$this->destroy_cache(array(), array_unique($author_ids));  	}  	/** diff --git a/phpBB/includes/search/fulltext_native.php b/phpBB/includes/search/fulltext_native.php index 727e3aaffb..b63205fd76 100644 --- a/phpBB/includes/search/fulltext_native.php +++ b/phpBB/includes/search/fulltext_native.php @@ -1334,7 +1334,7 @@ class fulltext_native extends search_backend  			$db->sql_query($sql);  		} -		$this->destroy_cache(array_unique($word_texts), $author_ids); +		$this->destroy_cache(array_unique($word_texts), array_unique($author_ids));  	}  	/** diff --git a/phpBB/includes/search/search.php b/phpBB/includes/search/search.php index 2f20d11495..df7c8a0892 100644 --- a/phpBB/includes/search/search.php +++ b/phpBB/includes/search/search.php @@ -295,7 +295,7 @@ class search_backend  			$sql_where = '';  			foreach ($authors as $author)  			{ -				$sql_where .= (($sql_where) ? ' OR ' : '') . 'search_authors LIKE \'% ' . (int) $author . ' %\''; +				$sql_where .= (($sql_where) ? ' OR ' : '') . 'search_authors ' . $db->sql_like_expression($db->any_char . ' ' . (int) $author . ' ' . $db->any_char);  			}  			$sql = 'SELECT search_key diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php index f69ca40613..bbf407f1dc 100644 --- a/phpBB/language/en/install.php +++ b/phpBB/language/en/install.php @@ -52,6 +52,7 @@ $lang = array_merge($lang, array(  	'BLANK_PREFIX_FOUND'			=> 'A scan of your tables has shown a valid installation using no table prefix.',  	'BOARD_NOT_INSTALLED'			=> 'No installation found',  	'BOARD_NOT_INSTALLED_EXPLAIN'	=> 'The phpBB Unified Convertor Framework requires a default installation of phpBB3 to function, please <a href="%s">proceed by first installing phpBB3</a>.', +	'BACKUP_NOTICE'					=> 'Please backup your board before updating in case any problems arise during the update process.',  	'CATEGORY'					=> 'Category',  	'CACHE_STORE'				=> 'Cache type', diff --git a/phpBB/search.php b/phpBB/search.php index 2aa61401cf..8cb2020630 100644 --- a/phpBB/search.php +++ b/phpBB/search.php @@ -469,33 +469,60 @@ if ($keywords || $author || $author_id || $search_id || $submit)  	$per_page = ($show_results == 'posts') ? $config['posts_per_page'] : $config['topics_per_page'];  	$total_match_count = 0; +	// Set limit for the $total_match_count to reduce server load +	$total_matches_limit = 1000; +	$found_more_search_matches = false; +  	if ($search_id)  	{  		if ($sql)  		{ -			// only return up to 1000 ids (the last one will be removed later) -			$result = $db->sql_query_limit($sql, 1001 - $start, $start); +			// Only return up to $total_matches_limit+1 ids (the last one will be removed later) +			$result = $db->sql_query_limit($sql, $total_matches_limit + 1);  			while ($row = $db->sql_fetchrow($result))  			{  				$id_ary[] = (int) $row[$field];  			}  			$db->sql_freeresult($result); - -			$total_match_count = sizeof($id_ary) + $start; -			$id_ary = array_slice($id_ary, 0, $per_page);  		}  		else if ($search_id == 'unreadposts')  		{ -			$id_ary = array_keys(get_unread_topics($user->data['user_id'], $sql_where, $sql_sort, 1001 - $start, $start)); - -			$total_match_count = sizeof($id_ary) + $start; -			$id_ary = array_slice($id_ary, 0, $per_page); +			// Only return up to $total_matches_limit+1 ids (the last one will be removed later) +			$id_ary = array_keys(get_unread_topics($user->data['user_id'], $sql_where, $sql_sort, $total_matches_limit + 1));  		}  		else  		{  			$search_id = '';  		} + +		$total_match_count = sizeof($id_ary); +		if ($total_match_count) +		{ +			// Limit the number to $total_matches_limit for pre-made searches +			if ($total_match_count > $total_matches_limit) +			{ +				$found_more_search_matches = true; +				$total_match_count = $total_matches_limit; +			} + +			// Make sure $start is set to the last page if it exceeds the amount +			if ($start < 0) +			{ +				$start = 0; +			} +			else if ($start >= $total_match_count) +			{ +				$start = floor(($total_match_count - 1) / $per_page) * $per_page; +			} + +			$id_ary = array_slice($id_ary, $start, $per_page); +		} +		else +		{ +			// Set $start to 0 if no matches were found +			$start = 0; +		}  	}  	// make sure that some arrays are always in the same order @@ -543,10 +570,8 @@ if ($keywords || $author || $author_id || $search_id || $submit)  	$icons = $cache->obtain_icons();  	// Output header -	if ($search_id && ($total_match_count > 1000)) +	if ($found_more_search_matches)  	{ -		// limit the number to 1000 for pre-made searches -		$total_match_count--;  		$l_search_matches = sprintf($user->lang['FOUND_MORE_SEARCH_MATCHES'], $total_match_count);  	}  	else diff --git a/phpBB/styles/prosilver/template/memberlist_body.html b/phpBB/styles/prosilver/template/memberlist_body.html index 9e6f8c3aab..5ea774bf06 100644 --- a/phpBB/styles/prosilver/template/memberlist_body.html +++ b/phpBB/styles/prosilver/template/memberlist_body.html @@ -80,7 +80,7 @@  	<span class="corners-bottom"><span></span></span></div>  </div>  <!-- ENDIF --> -<div class="forumbg"> +<div class="forumbg forumbg-table">  	<div class="inner"><span class="corners-top"><span></span></span>  	<table class="table1" cellspacing="1"> diff --git a/phpBB/styles/prosilver/template/memberlist_leaders.html b/phpBB/styles/prosilver/template/memberlist_leaders.html index 3917498050..26e299d261 100644 --- a/phpBB/styles/prosilver/template/memberlist_leaders.html +++ b/phpBB/styles/prosilver/template/memberlist_leaders.html @@ -4,7 +4,7 @@  <form method="post" action="{S_MODE_ACTION}"> -<div class="forumbg"> +<div class="forumbg forumbg-table">  	<div class="inner"><span class="corners-top"><span></span></span>  	<table class="table1" cellspacing="1"> @@ -37,7 +37,7 @@  	<span class="corners-bottom"><span></span></span></div>  </div> -<div class="forumbg"> +<div class="forumbg forumbg-table">  	<div class="inner"><span class="corners-top"><span></span></span>  	<table class="table1" cellspacing="1"> diff --git a/phpBB/styles/prosilver/template/search_body.html b/phpBB/styles/prosilver/template/search_body.html index 6616b95a73..4b1d30d77d 100644 --- a/phpBB/styles/prosilver/template/search_body.html +++ b/phpBB/styles/prosilver/template/search_body.html @@ -98,7 +98,7 @@  </form>  <!-- IF .recentsearch --> -<div class="forumbg"> +<div class="forumbg forumbg-table">  	<div class="inner"><span class="corners-top"><span></span></span>  	<table class="table1" cellspacing="1"> diff --git a/phpBB/styles/prosilver/template/template.cfg b/phpBB/styles/prosilver/template/template.cfg index d31dcb7356..0b0533573a 100644 --- a/phpBB/styles/prosilver/template/template.cfg +++ b/phpBB/styles/prosilver/template/template.cfg @@ -23,3 +23,8 @@ version = 3.0.10  # Defining a different template bitfield  template_bitfield = lNg= + +# Template inheritance +# See http://blog.phpbb.com/2008/07/31/templating-just-got-easier/ +# Set value to empty to ignore template inheritance +inherit_from = prosilver diff --git a/phpBB/styles/prosilver/template/ucp_main_front.html b/phpBB/styles/prosilver/template/ucp_main_front.html index 39c5d4f396..4a6fa3bf86 100644 --- a/phpBB/styles/prosilver/template/ucp_main_front.html +++ b/phpBB/styles/prosilver/template/ucp_main_front.html @@ -34,8 +34,8 @@  		<dt>{L_JOINED}:</dt> <dd>{JOINED}</dd>  		<dt>{L_VISITED}:</dt> <dd>{LAST_VISIT_YOU}</dd>  		<dt>{L_TOTAL_POSTS}:</dt> <dd><!-- IF POSTS_PCT -->{POSTS}<!-- IF S_DISPLAY_SEARCH --> | <strong><a href="{U_SEARCH_USER}">{L_SEARCH_YOUR_POSTS}</a></strong><!-- ENDIF --><br />({POSTS_DAY} / {POSTS_PCT})<!-- ELSE -->{POSTS}<!-- ENDIF --></dd> -		<!-- IF ACTIVE_FORUM --><dt>{L_ACTIVE_IN_FORUM}:</dt> <dd><strong><a href="{U_ACTIVE_FORUM}">{ACTIVE_FORUM}</a></strong><br />({ACTIVE_FORUM_POSTS} / {ACTIVE_FORUM_PCT})</dd><!-- ENDIF --> -		<!-- IF ACTIVE_TOPIC --><dt>{L_ACTIVE_IN_TOPIC}:</dt> <dd><strong><a href="{U_ACTIVE_TOPIC}">{ACTIVE_TOPIC}</a></strong><br />({ACTIVE_TOPIC_POSTS} / {ACTIVE_TOPIC_PCT})</dd><!-- ENDIF --> +		<!-- IF ACTIVE_FORUM != '' --><dt>{L_ACTIVE_IN_FORUM}:</dt> <dd><strong><a href="{U_ACTIVE_FORUM}">{ACTIVE_FORUM}</a></strong><br />({ACTIVE_FORUM_POSTS} / {ACTIVE_FORUM_PCT})</dd><!-- ENDIF --> +		<!-- IF ACTIVE_TOPIC != '' --><dt>{L_ACTIVE_IN_TOPIC}:</dt> <dd><strong><a href="{U_ACTIVE_TOPIC}">{ACTIVE_TOPIC}</a></strong><br />({ACTIVE_TOPIC_POSTS} / {ACTIVE_TOPIC_PCT})</dd><!-- ENDIF -->  		<!-- IF WARNINGS --><dt>{L_YOUR_WARNINGS}:</dt> <dd class="error">{WARNING_IMG} [{WARNINGS}]</dd><!-- ENDIF -->  	</dl> diff --git a/phpBB/styles/prosilver/template/ucp_pm_message_header.html b/phpBB/styles/prosilver/template/ucp_pm_message_header.html index fcebab0868..ae66dd0a36 100644 --- a/phpBB/styles/prosilver/template/ucp_pm_message_header.html +++ b/phpBB/styles/prosilver/template/ucp_pm_message_header.html @@ -1,25 +1,22 @@  <h2>{L_TITLE}<!-- IF CUR_FOLDER_NAME -->: {CUR_FOLDER_NAME}<!-- ENDIF --></h2> -<div class="panel clearfix pm-panel-header<!-- IF S_VIEW_MESSAGE --> pm<!-- ENDIF -->"> +<form id="viewfolder" method="post" action="{S_PM_ACTION}"> + +<div class="panel">  	<div class="inner"><span class="corners-top"><span></span></span>  	<!-- IF FOLDER_STATUS and FOLDER_MAX_MESSAGES neq 0 --><p>{FOLDER_STATUS}</p><!-- ENDIF --> -  	<!-- IF U_POST_REPLY_PM or U_POST_NEW_TOPIC or U_FORWARD_PM -->  		<div class="buttons"> -			<!-- IF U_POST_REPLY_PM --><div class="pmreply-icon clearfix"><a title="{L_POST_REPLY_PM}" href="{U_POST_REPLY_PM}"><span></span>{L_POST_REPLY_PM}</a></div> +			<!-- IF U_POST_REPLY_PM --><div class="pmreply-icon"><a title="{L_POST_REPLY_PM}" href="{U_POST_REPLY_PM}"><span></span>{L_POST_REPLY_PM}</a></div>  			<!-- ELSEIF U_POST_NEW_TOPIC --><div class="newpm-icon"><a href="{U_POST_NEW_TOPIC}" accesskey="n" title="{L_UCP_PM_COMPOSE}"><span></span>{L_UCP_PM_COMPOSE}</a></div><!-- ENDIF -->  			<!-- IF U_FORWARD_PM --><div class="forwardpm-icon"><a title="{L_POST_FORWARD_PM}" href="{U_FORWARD_PM}"><span></span>{L_FORWARD_PM}</a></div><!-- ENDIF --> +			<!-- IF U_POST_REPLY_PM and S_PM_RECIPIENTS gt 1 --><div class="reply-all"><a class="left" title="{L_REPLY_TO_ALL}" href="{U_POST_REPLY_ALL}">{L_REPLY_TO_ALL}</a></div><!-- ENDIF -->			  		</div> - -		<!-- IF U_POST_REPLY_PM and S_PM_RECIPIENTS gt 1 --> -			<div class="reply-all"><a title="{L_REPLY_TO_ALL}" href="{U_POST_REPLY_ALL}">» {L_REPLY_TO_ALL}</a></div> -		<!-- ENDIF --> -  	<!-- ENDIF --> -		<!-- IF TOTAL_MESSAGES or S_VIEW_MESSAGE --> -	<ul class="linklist pm-return-to"> +	<!-- IF TOTAL_MESSAGES or S_VIEW_MESSAGE --> +	<ul class="linklist">  		<li class="rightside pagination">  			<!-- IF S_VIEW_MESSAGE --><a class="{S_CONTENT_FLOW_BEGIN}" href="{U_CURRENT_FOLDER}">{L_RETURN_TO} {CUR_FOLDER_NAME}</a><!-- ENDIF -->  			<!-- IF FOLDER_CUR_MESSAGES neq 0 --> @@ -28,8 +25,4 @@  			<!-- ENDIF -->  		</li>  	</ul> -		<!-- ENDIF --> -	</div> -</div> - -<form id="viewfolder" method="post" action="{S_PM_ACTION}"> +	<!-- ENDIF --> diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html b/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html index d7e02e405e..c9f28cec64 100644 --- a/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html +++ b/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html @@ -2,7 +2,6 @@  <!-- IF not PROMPT -->  	<!-- INCLUDE ucp_pm_message_header.html --> -	<div class="panel pm-panel-message"><div>  <!-- ENDIF -->  <!-- IF PROMPT --> diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html index df0cf25e82..1840732b64 100644 --- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html +++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html @@ -1,18 +1,21 @@ -	<!-- INCLUDE ucp_header.html --> +<!-- INCLUDE ucp_header.html -->  <!-- INCLUDE ucp_pm_message_header.html --> +	<span class="corners-bottom"><span></span></span></div> +</div> +  <!-- IF S_DISPLAY_HISTORY and (U_VIEW_PREVIOUS_HISTORY or U_VIEW_NEXT_HISTORY) --> -	<fieldset class="display-options clearfix bg1 pm-message-nav"> +	<fieldset class="display-options clearfix">  		<!-- IF U_VIEW_PREVIOUS_HISTORY --><a href="{U_VIEW_PREVIOUS_HISTORY}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_VIEW_PREVIOUS_HISTORY}</a><!-- ENDIF -->  		<!-- IF U_VIEW_NEXT_HISTORY --><a href="{U_VIEW_NEXT_HISTORY}" class="right-box {S_CONTENT_FLOW_END}">{L_VIEW_NEXT_HISTORY}</a><!-- ENDIF -->  	</fieldset>  <!-- ENDIF --> -<div id="post-{MESSAGE_ID}" class="panel clearfix post pm-panel-message pm<!-- IF S_POST_UNAPPROVED or S_POST_REPORTED --> reported<!-- ENDIF --><!-- IF S_ONLINE --> online<!-- ENDIF -->"> -<div> +<div id="post-{MESSAGE_ID}" class="post pm<!-- IF S_POST_UNAPPROVED or S_POST_REPORTED --> reported<!-- ENDIF --><!-- IF S_ONLINE --> online<!-- ENDIF -->"> +<div class="inner"><span class="corners-top"><span></span></span>  	<div class="postbody"> diff --git a/phpBB/styles/prosilver/template/viewonline_body.html b/phpBB/styles/prosilver/template/viewonline_body.html index b111d743f9..3f1f0e64bf 100644 --- a/phpBB/styles/prosilver/template/viewonline_body.html +++ b/phpBB/styles/prosilver/template/viewonline_body.html @@ -7,7 +7,7 @@  	<li class="rightside pagination"><!-- IF PAGINATION --><a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> • <span>{PAGINATION}</span><!-- ELSE -->{PAGE_NUMBER}<!-- ENDIF --></li>  </ul> -<div class="forumbg"> +<div class="forumbg forumbg-table">  	<div class="inner"><span class="corners-top"><span></span></span>  	<table class="table1" cellspacing="1"> diff --git a/phpBB/styles/prosilver/theme/bidi.css b/phpBB/styles/prosilver/theme/bidi.css index d1cff9c8be..c258ed1245 100644 --- a/phpBB/styles/prosilver/theme/bidi.css +++ b/phpBB/styles/prosilver/theme/bidi.css @@ -591,6 +591,19 @@  /* PM Styles  ----------------------------------------*/ +/* PM panel adjustments */ +.rtl .reply-all a.right { +	background-position: 5% 60%; +} + +.rtl .reply-all a.right:hover { +	background-position: 3% 60%; +} + +.rtl .reply-all { +	padding-left: 5px; +} +  /* Defined rules list for PM options */  .rtl ol.def-rules {  	padding-right: 0; diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css index e98ce237bc..b9e4491feb 100644 --- a/phpBB/styles/prosilver/theme/colours.css +++ b/phpBB/styles/prosilver/theme/colours.css @@ -884,12 +884,6 @@ dl.mini dt {  	color: #000000 !important;  } -/* PM panel adjustments */ -.pm-panel-header, -#cp-main .pm-message-nav { -	border-bottom-color: #A4B3BF; -} -  /* PM marking colours */  .pmlist li.pm_message_reported_colour, .pm_message_reported_colour {  	border-left-color: #BC2A4D; diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index 8b5e09297e..7eb00bd808 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -418,7 +418,19 @@ table.info tbody th {  }  .forumbg table.table1 { -	margin: 0 -2px -1px -1px; +	margin: 0; +} + +.forumbg-table > .inner { +	margin: 0 -1px; +} + +.forumbg-table > .inner > span.corners-top { +	margin: 0 -4px -1px -4px; +} + +.forumbg-table > .inner > span.corners-bottom { +	margin: -1px -4px 0 -4px;  }  /* Misc layout styles diff --git a/phpBB/styles/prosilver/theme/cp.css b/phpBB/styles/prosilver/theme/cp.css index 708bfbaf83..aed88831a8 100644 --- a/phpBB/styles/prosilver/theme/cp.css +++ b/phpBB/styles/prosilver/theme/cp.css @@ -349,31 +349,17 @@ dl.mini dd {  }  /* PM panel adjustments */ -.pm-panel-header { -	margin: 0;  -	padding-bottom: 10px;  -	border-bottom: 1px dashed #A4B3BF; +.reply-all a.left { +	background-position: 3px 60%;  } -.reply-all { -	display: block;  -	padding-top: 4px;  -	clear: both; -	float: left; -} - -.pm-panel-message { -	padding-top: 10px; +.reply-all a.left:hover { +	background-position: 0px 60%;  } -.pm-return-to { -	padding-top: 23px; -} - -#cp-main .pm-message-nav { -	margin: 0;  -	padding: 2px 10px 5px 10px;  -	border-bottom: 1px dashed #A4B3BF; +.reply-all { +	font-size: 11px; +	padding-top: 5px;  }  /* PM Message history */ diff --git a/phpBB/styles/prosilver/theme/tweaks.css b/phpBB/styles/prosilver/theme/tweaks.css index f7322c2cce..5e11b2122b 100644 --- a/phpBB/styles/prosilver/theme/tweaks.css +++ b/phpBB/styles/prosilver/theme/tweaks.css @@ -87,10 +87,6 @@ dl.icon {  	float: none;  } -* html .forumbg table.table1 { -	margin: 0 -2px 0px -1px; -} -  /* Headerbar height fix for IE7 and below */  * html #site-description p {  	margin-bottom: 1.0em; diff --git a/phpBB/styles/subsilver2/template/captcha_default.html b/phpBB/styles/subsilver2/template/captcha_default.html index 4c65f81643..e2edf0b810 100644 --- a/phpBB/styles/subsilver2/template/captcha_default.html +++ b/phpBB/styles/subsilver2/template/captcha_default.html @@ -12,6 +12,6 @@  	</tr>  	<tr>  		<td class="row1"><b class="genmed">{L_CONFIRM_CODE}:</b><br /><span class="gensmall">{L_CONFIRM_CODE_EXPLAIN}</span></td> -		<td class="row2"><input class="post" type="text" name="confirm_code" size="8" maxlength="8" /> +		<td class="row2"><input class="post" type="text" name="confirm_code" size="8" maxlength="8"<!-- IF $CAPTCHA_TAB_INDEX --> tabindex="{$CAPTCHA_TAB_INDEX}"<!-- ENDIF --> />  		<!-- IF S_CONFIRM_REFRESH --><input type="submit" name="refresh_vc" id="refresh_vc" class="btnlite" value="{L_VC_REFRESH}" /><!-- ENDIF --></td>  	</tr> diff --git a/phpBB/styles/subsilver2/template/captcha_qa.html b/phpBB/styles/subsilver2/template/captcha_qa.html index 23d2a92f68..acc9cdcdfb 100644 --- a/phpBB/styles/subsilver2/template/captcha_qa.html +++ b/phpBB/styles/subsilver2/template/captcha_qa.html @@ -3,6 +3,6 @@  	</tr>  	<tr>  		<td class="row1"><b class="genmed">{QA_CONFIRM_QUESTION}:</b><br /><span class="gensmall">{L_CONFIRM_QUESTION_EXPLAIN}</span></td> -		<td class="row2"><input class="post" type="text" name="qa_answer" size="80" /></td> +		<td class="row2"><input class="post" type="text" name="qa_answer" size="80"<!-- IF $CAPTCHA_TAB_INDEX --> tabindex="{$CAPTCHA_TAB_INDEX}"<!-- ENDIF --> /></td>  		<input type="hidden" name="qa_confirm_id" id="confirm_id" value="{QA_CONFIRM_ID}" /></td>  	</tr> diff --git a/phpBB/styles/subsilver2/template/login_body.html b/phpBB/styles/subsilver2/template/login_body.html index 262341e0c0..ba316517a9 100644 --- a/phpBB/styles/subsilver2/template/login_body.html +++ b/phpBB/styles/subsilver2/template/login_body.html @@ -68,7 +68,7 @@  <!-- IF CAPTCHA_TEMPLATE and S_CONFIRM_CODE -->  </table>  <table class="tablebg" width="100%" cellspacing="1"> -		 +	<!-- DEFINE $CAPTCHA_TAB_INDEX = 4 -->  	<!-- INCLUDE {CAPTCHA_TEMPLATE} -->  <!-- ENDIF --> diff --git a/phpBB/styles/subsilver2/template/posting_body.html b/phpBB/styles/subsilver2/template/posting_body.html index fec6d7ff6c..d7947caf2f 100644 --- a/phpBB/styles/subsilver2/template/posting_body.html +++ b/phpBB/styles/subsilver2/template/posting_body.html @@ -333,6 +333,7 @@  <!-- ENDIF -->  		<!-- IF CAPTCHA_TEMPLATE and S_CONFIRM_CODE --> +		<!-- DEFINE $CAPTCHA_TAB_INDEX = 4 -->  		<!-- INCLUDE {CAPTCHA_TEMPLATE} -->  		<!-- ENDIF --> diff --git a/phpBB/styles/subsilver2/template/template.cfg b/phpBB/styles/subsilver2/template/template.cfg index 4e5c36af99..d557edba87 100644 --- a/phpBB/styles/subsilver2/template/template.cfg +++ b/phpBB/styles/subsilver2/template/template.cfg @@ -21,3 +21,7 @@ name = subsilver2  copyright = © phpBB Group, 2003  version = 3.0.10 +# Template inheritance +# See http://blog.phpbb.com/2008/07/31/templating-just-got-easier/ +# Set value to empty to ignore template inheritance +inherit_from = subsilver2 diff --git a/phpBB/styles/subsilver2/template/ucp_main_front.html b/phpBB/styles/subsilver2/template/ucp_main_front.html index fdef0bd949..dc945c83d6 100644 --- a/phpBB/styles/subsilver2/template/ucp_main_front.html +++ b/phpBB/styles/subsilver2/template/ucp_main_front.html @@ -48,11 +48,11 @@  		<!-- IF S_SHOW_ACTIVITY -->  			<tr>  				<td align="{S_CONTENT_FLOW_END}" valign="top" nowrap="nowrap"><b class="genmed">{L_ACTIVE_IN_FORUM}: </b></td> -				<td><!-- IF ACTIVE_FORUM --><b><a class="gen" href="{U_ACTIVE_FORUM}">{ACTIVE_FORUM}</a></b><br /><span class="genmed">[ {ACTIVE_FORUM_POSTS} / {ACTIVE_FORUM_PCT} ]</span><!-- ELSE --><span class="gen">-</span><!-- ENDIF --></td> +				<td><!-- IF ACTIVE_FORUM != '' --><b><a class="gen" href="{U_ACTIVE_FORUM}">{ACTIVE_FORUM}</a></b><br /><span class="genmed">[ {ACTIVE_FORUM_POSTS} / {ACTIVE_FORUM_PCT} ]</span><!-- ELSE --><span class="gen">-</span><!-- ENDIF --></td>  			</tr>  			<tr>  				<td align="{S_CONTENT_FLOW_END}" valign="top" nowrap="nowrap"><b class="genmed">{L_ACTIVE_IN_TOPIC}: </b></td> -				<td><!-- IF ACTIVE_TOPIC --><b><a class="gen" href="{U_ACTIVE_TOPIC}">{ACTIVE_TOPIC}</a></b><br /><span class="genmed">[ {ACTIVE_TOPIC_POSTS} / {ACTIVE_TOPIC_PCT} ]</span><!-- ELSE --><span class="gen">-</span><!-- ENDIF --></td> +				<td><!-- IF ACTIVE_TOPIC != '' --><b><a class="gen" href="{U_ACTIVE_TOPIC}">{ACTIVE_TOPIC}</a></b><br /><span class="genmed">[ {ACTIVE_TOPIC_POSTS} / {ACTIVE_TOPIC_PCT} ]</span><!-- ELSE --><span class="gen">-</span><!-- ENDIF --></td>  			</tr>  		<!-- ENDIF -->  		<!-- IF WARNINGS --> diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php index 588f60b589..6fec662b02 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -278,7 +278,7 @@ if (!empty($_EXTRA_URL))  	foreach ($_EXTRA_URL as $url_param)  	{  		$url_param = explode('=', $url_param, 2); -		$s_hidden_fields[$url_param[0]] = $url_param[1]; +		$s_search_hidden_fields[$url_param[0]] = $url_param[1];  	}  } diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 01cd6a28a8..74420a25c7 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -607,7 +607,7 @@ if (!empty($_EXTRA_URL))  	foreach ($_EXTRA_URL as $url_param)  	{  		$url_param = explode('=', $url_param, 2); -		$s_hidden_fields[$url_param[0]] = $url_param[1]; +		$s_search_hidden_fields[$url_param[0]] = $url_param[1];  	}  } diff --git a/tests/bootstrap.php b/tests/bootstrap.php index 16aed68405..2fb805043e 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -10,25 +10,9 @@  define('IN_PHPBB', true);  $phpbb_root_path = 'phpBB/';  $phpEx = 'php'; -$table_prefix = 'phpbb_'; - -if (!defined('E_DEPRECATED')) -{ -    define('E_DEPRECATED', 8192); -} -error_reporting(E_ALL & ~E_DEPRECATED); - -// If we are on PHP >= 6.0.0 we do not need some code -if (version_compare(PHP_VERSION, '6.0.0-dev', '>=')) -{ -	define('STRIP', false); -} -else -{ -	@set_magic_quotes_runtime(0); -	define('STRIP', (get_magic_quotes_gpc()) ? true : false); -} +require_once $phpbb_root_path . 'includes/startup.php'; +$table_prefix = 'phpbb_';  require_once $phpbb_root_path . 'includes/constants.php';  require_once 'test_framework/phpbb_test_case_helpers.php';  | 
