5 files changed, 93 insertions, 37 deletions
diff --git a/phpBB/phpbb/cron/task/core/tidy_search.php b/phpBB/phpbb/cron/task/core/tidy_search.php
index 2de744b7c1..2c30274dfa 100644
--- a/phpBB/phpbb/cron/task/core/tidy_search.php
+++ b/phpBB/phpbb/cron/task/core/tidy_search.php
@@ -54,8 +54,7 @@ class tidy_search extends \phpbb\cron\task\base
 	*/
 	public function run()
 	{
-		// Select the search method
-		$search_type = basename($this->config['search_type']);
+		$search_type = $this->config['search_type'];
 
 		// We do some additional checks in the module to ensure it can actually be utilised
 		$error = false;
@@ -78,10 +77,7 @@ class tidy_search extends \phpbb\cron\task\base
 	*/
 	public function is_runnable()
 	{
-		// Select the search method
-		$search_type = basename($this->config['search_type']);
-
-		return class_exists($search_type);
+		return class_exists($this->config['search_type']);
 	}
 
 	/**
diff --git a/phpBB/phpbb/plupload/plupload.php b/phpBB/phpbb/plupload/plupload.php
index c610d49a63..3c686a552f 100644
--- a/phpBB/phpbb/plupload/plupload.php
+++ b/phpBB/phpbb/plupload/plupload.php
@@ -79,8 +79,7 @@ class plupload
 		$this->php_ini = $php_ini;
 		$this->mimetype_guesser = $mimetype_guesser;
 
-		$this->upload_directory = $this->phpbb_root_path . $this->config['upload_path'];
-		$this->temporary_directory = $this->upload_directory . '/plupload';
+		$this->set_default_directories();
 	}
 
 	/**
@@ -120,6 +119,9 @@ class plupload
 		{
 			rename("{$file_path}.part", $file_path);
 
+			// Reset upload directories to defaults once completed
+			$this->set_default_directories();
+
 			// Need to modify some of the $_FILES values to reflect the new file
 			return array(
 				'tmp_name' => $file_path,
@@ -372,4 +374,29 @@ class plupload
 			);
 		}
 	}
+
+	/**
+	* Sets the default directories for uploads
+	*
+	* @return null
+	*/
+	protected function set_default_directories()
+	{
+		$this->upload_directory = $this->phpbb_root_path . $this->config['upload_path'];
+		$this->temporary_directory = $this->upload_directory . '/plupload';
+	}
+
+	/**
+	* Sets the upload directories to the specified paths
+	*
+	* @param string $upload_directory Upload directory
+	* @param string $temporary_directory Temporary directory
+	*
+	* @return null
+	*/
+	public function set_upload_directories($upload_directory, $temporary_directory)
+	{
+		$this->upload_directory = $upload_directory;
+		$this->temporary_directory = $temporary_directory;
+	}
 }
diff --git a/phpBB/phpbb/profilefields/manager.php b/phpBB/phpbb/profilefields/manager.php
index f3b1676799..98802d2209 100644
--- a/phpBB/phpbb/profilefields/manager.php
+++ b/phpBB/phpbb/profilefields/manager.php
@@ -397,7 +397,7 @@ class manager
 			}
 
 			$field_desc = $contact_url = '';
-			if ($use_contact_fields)
+			if ($use_contact_fields && $ident_ary['data']['field_is_contact'])
 			{
 				$value = $profile_field->get_profile_contact_value($ident_ary['value'], $ident_ary['data']);
 				$field_desc = $this->user->lang($ident_ary['data']['field_contact_desc']);
diff --git a/phpBB/phpbb/profilefields/type/type_string_common.php b/phpBB/phpbb/profilefields/type/type_string_common.php
index c2b951b6c9..0eaf7e527d 100644
--- a/phpBB/phpbb/profilefields/type/type_string_common.php
+++ b/phpBB/phpbb/profilefields/type/type_string_common.php
@@ -98,7 +98,7 @@ abstract class type_string_common extends type_base
 	*/
 	public function get_profile_value($field_value, $field_data)
 	{
-		if (!$field_value && !$field_data['field_show_novalue'])
+		if (($field_value === null || $field_value === '') && !$field_data['field_show_novalue'])
 		{
 			return null;
 		}
@@ -114,7 +114,7 @@ abstract class type_string_common extends type_base
 	*/
 	public function get_profile_value_raw($field_value, $field_data)
 	{
-		if (!$field_value && !$field_data['field_show_novalue'])
+		if (($field_value === null || $field_value === '') && !$field_data['field_show_novalue'])
 		{
 			return null;
 		}
@@ -127,12 +127,7 @@ abstract class type_string_common extends type_base
 	*/
 	public function get_profile_contact_value($field_value, $field_data)
 	{
-		if (!$field_value && !$field_data['field_show_novalue'])
-		{
-			return null;
-		}
-
-		return $field_value;
+		return $this->get_profile_value_raw($field_value, $field_data);
 	}
 
 	/**
diff --git a/phpBB/phpbb/template/context.php b/phpBB/phpbb/template/context.php
index 0a32879943..4ee48205c8 100644
--- a/phpBB/phpbb/template/context.php
+++ b/phpBB/phpbb/template/context.php
@@ -34,6 +34,11 @@ class context
 	*/
 	private $rootref;
 
+	/**
+	* @var bool
+	*/
+	private $num_rows_is_set;
+
 	public function __construct()
 	{
 		$this->clear();
@@ -46,6 +51,7 @@ class context
 	{
 		$this->tpldata = array('.' => array(0 => array()));
 		$this->rootref = &$this->tpldata['.'][0];
+		$this->num_rows_is_set = false;
 	}
 
 	/**
@@ -95,10 +101,59 @@ class context
 		// returning a reference directly is not
 		// something php is capable of doing
 		$ref = &$this->tpldata;
+
+		if (!$this->num_rows_is_set)
+		{
+			/*
+			* We do not set S_NUM_ROWS while adding a row, to reduce the complexity
+			* If we would set it on adding, each subsequent adding would cause
+			* n modifications, resulting in a O(n!) complexity, rather then O(n)
+			*/
+			foreach ($ref as $loop_name => &$loop_data)
+			{
+				if ($loop_name === '.')
+				{
+					continue;
+				}
+
+				$this->set_num_rows($loop_data);
+			}
+			$this->num_rows_is_set = true;
+		}
+
 		return $ref;
 	}
 
 	/**
+	* Set S_NUM_ROWS for each row in this template block
+	*
+	* @param array $loop_data
+	*/
+	protected function set_num_rows(&$loop_data)
+	{
+		$s_num_rows = sizeof($loop_data);
+		foreach ($loop_data as &$mod_block)
+		{
+			foreach ($mod_block as $sub_block_name => &$sub_block)
+			{
+				// If the key name is lowercase and the data is an array,
+				// it could be a template loop. So we set the S_NUM_ROWS there
+				// aswell.
+				if ($sub_block_name === strtolower($sub_block_name) && is_array($sub_block))
+				{
+					$this->set_num_rows($sub_block);
+				}
+			}
+
+			// Check whether we are inside a block before setting the variable
+			if (isset($mod_block['S_BLOCK_NAME']))
+			{
+				$mod_block['S_NUM_ROWS'] = $s_num_rows;
+			}
+		}
+	}
+
+	/**
 	* Returns a reference to template root scope.
 	*
 	* This function is public so that template renderer may invoke it.
@@ -123,6 +178,7 @@ class context
 	*/
 	public function assign_block_vars($blockname, array $vararray)
 	{
+		$this->num_rows_is_set = false;
 		if (strpos($blockname, '.') !== false)
 		{
 			// Nested block.
@@ -160,13 +216,6 @@ class context
 			// We're adding a new iteration to this block with the given
 			// variable assignments.
 			$str[$blocks[$blockcount]][] = $vararray;
-			$s_num_rows = sizeof($str[$blocks[$blockcount]]);
-
-			// Set S_NUM_ROWS
-			foreach ($str[$blocks[$blockcount]] as &$mod_block)
-			{
-				$mod_block['S_NUM_ROWS'] = $s_num_rows;
-			}
 		}
 		else
 		{
@@ -192,13 +241,6 @@ class context
 
 			// Add a new iteration to this block with the variable assignments we were given.
 			$this->tpldata[$blockname][] = $vararray;
-			$s_num_rows = sizeof($this->tpldata[$blockname]);
-
-			// Set S_NUM_ROWS
-			foreach ($this->tpldata[$blockname] as &$mod_block)
-			{
-				$mod_block['S_NUM_ROWS'] = $s_num_rows;
-			}
 		}
 
 		return true;
@@ -250,6 +292,7 @@ class context
 	*/
 	public function alter_block_array($blockname, array $vararray, $key = false, $mode = 'insert')
 	{
+		$this->num_rows_is_set = false;
 		if (strpos($blockname, '.') !== false)
 		{
 			// Nested block.
@@ -349,12 +392,6 @@ class context
 			$block[$key] = $vararray;
 			$block[$key]['S_ROW_COUNT'] = $block[$key]['S_ROW_NUM'] = $key;
 
-			// Set S_NUM_ROWS
-			foreach ($this->tpldata[$blockname] as &$mod_block)
-			{
-				$mod_block['S_NUM_ROWS'] = sizeof($this->tpldata[$blockname]);
-			}
-
 			return true;
 		}
 
@@ -382,6 +419,7 @@ class context
 	*/
 	public function destroy_block_vars($blockname)
 	{
+		$this->num_rows_is_set = false;
 		if (strpos($blockname, '.') !== false)
 		{
 			// Nested block.