17 files changed, 108 insertions, 79 deletions
diff --git a/phpBB/phpbb/console/command/cache/purge.php b/phpBB/phpbb/console/command/cache/purge.php
index 8c51d1b5a8..ec8229200c 100644
--- a/phpBB/phpbb/console/command/cache/purge.php
+++ b/phpBB/phpbb/console/command/cache/purge.php
@@ -59,7 +59,7 @@ class purge extends \phpbb\console\command\command
 	{
 		$this
 			->setName('cache:purge')
-			->setDescription('Purge the cache.')
+			->setDescription($this->user->lang('PURGE_CACHE'))
 		;
 	}
 
diff --git a/phpBB/phpbb/console/command/config/delete.php b/phpBB/phpbb/console/command/config/delete.php
index 1310bb18b4..efd276d7e3 100644
--- a/phpBB/phpbb/console/command/config/delete.php
+++ b/phpBB/phpbb/console/command/config/delete.php
@@ -25,11 +25,11 @@ class delete extends command
 	{
 		$this
 			->setName('config:delete')
-			->setDescription('Deletes a configuration option')
+			->setDescription($this->user->lang('CLI_DESCRIPTION_DELETE_CONFIG'))
 			->addArgument(
 				'key',
 				InputArgument::REQUIRED,
-				"The configuration option's name"
+				$this->user->lang('CLI_CONFIG_OPTION_NAME')
 			)
 		;
 	}
@@ -53,11 +53,11 @@ class delete extends command
 		{
 			$this->config->delete($key);
 
-			$output->writeln("<info>Successfully deleted config $key</info>");
+			$output->writeln('<info>' . $this->user->lang('CLI_CONFIG_DELETE_SUCCESS', $key) . '</info>');
 		}
 		else
 		{
-			$output->writeln("<error>Config $key does not exist</error>");
+			$output->writeln('<error>' . $this->user->lang('CLI_CONFIG_NOT_EXISTS', $key) . '</error>');
 		}
 	}
 }
diff --git a/phpBB/phpbb/console/command/config/get.php b/phpBB/phpbb/console/command/config/get.php
index ee8c65110e..9c03b49a3d 100644
--- a/phpBB/phpbb/console/command/config/get.php
+++ b/phpBB/phpbb/console/command/config/get.php
@@ -26,17 +26,17 @@ class get extends command
 	{
 		$this
 			->setName('config:get')
-			->setDescription("Gets a configuration option's value")
+			->setDescription($this->user->lang('CLI_DESCRIPTION_GET_CONFIG'))
 			->addArgument(
 				'key',
 				InputArgument::REQUIRED,
-				"The configuration option's name"
+				$this->user->lang('CLI_CONFIG_OPTION_NAME')
 			)
 			->addOption(
 				'no-newline',
 				null,
 				InputOption::VALUE_NONE,
-				'Set this option if the value should be printed without a new line at the end.'
+				$this->user->lang('CLI_CONFIG_PRINT_WITHOUT_NEWLINE')
 			)
 		;
 	}
@@ -66,7 +66,7 @@ class get extends command
 		}
 		else
 		{
-			$output->writeln("<error>Could not get config $key</error>");
+			$output->writeln('<error>' . $this->user->lang('CLI_CONFIG_NOT_EXISTS', $key) . '</error>');
 		}
 	}
 }
diff --git a/phpBB/phpbb/console/command/config/increment.php b/phpBB/phpbb/console/command/config/increment.php
index 21f0660e61..0c25075ce8 100644
--- a/phpBB/phpbb/console/command/config/increment.php
+++ b/phpBB/phpbb/console/command/config/increment.php
@@ -26,22 +26,22 @@ class increment extends command
 	{
 		$this
 			->setName('config:increment')
-			->setDescription("Increments a configuration option's value")
+			->setDescription($this->user->lang('CLI_DESCRIPTION_INCREMENT_CONFIG'))
 			->addArgument(
 				'key',
 				InputArgument::REQUIRED,
-				"The configuration option's name"
+				$this->user->lang('CLI_CONFIG_OPTION_NAME')
 			)
 			->addArgument(
 				'increment',
 				InputArgument::REQUIRED,
-				'Amount to increment by'
+				$this->user->lang('CLI_CONFIG_INCREMENT_BY')
 			)
 			->addOption(
 				'dynamic',
 				'd',
 				InputOption::VALUE_NONE,
-				'Set this option if the configuration option changes too frequently to be efficiently cached.'
+				$this->user-lang('CLI_CONFIG_CANNOT_CACHED')
 			)
 		;
 	}
@@ -65,6 +65,6 @@ class increment extends command
 
 		$this->config->increment($key, $increment, $use_cache);
 
-		$output->writeln("<info>Successfully incremented config $key</info>");
+		$output->writeln('<info>' . $this->user->lang('CLI_CONFIG_INCREMENT_SUCCESS', $key) . '</info>');
 	}
 }
diff --git a/phpBB/phpbb/console/command/config/set.php b/phpBB/phpbb/console/command/config/set.php
index 587b7fb0de..695de31013 100644
--- a/phpBB/phpbb/console/command/config/set.php
+++ b/phpBB/phpbb/console/command/config/set.php
@@ -26,22 +26,22 @@ class set extends command
 	{
 		$this
 			->setName('config:set')
-			->setDescription("Sets a configuration option's value")
+			->setDescription($this->user->lang('CLI_DESCRIPTION_SET_CONFIG'))
 			->addArgument(
 				'key',
 				InputArgument::REQUIRED,
-				"The configuration option's name"
+				$this->user->lang('CLI_CONFIG_OPTION_NAME')
 			)
 			->addArgument(
 				'value',
 				InputArgument::REQUIRED,
-				'New configuration value, use 0 and 1 to specify boolean values'
+				$this->user->lang('CLI_CONFIG_NEW')
 			)
 			->addOption(
 				'dynamic',
 				'd',
 				InputOption::VALUE_NONE,
-				'Set this option if the configuration option changes too frequently to be efficiently cached.'
+				$this->user->lang('CLI_CONFIG_CANNOT_CACHED')
 			)
 		;
 	}
@@ -65,6 +65,6 @@ class set extends command
 
 		$this->config->set($key, $value, $use_cache);
 
-		$output->writeln("<info>Successfully set config $key</info>");
+		$output->writeln('<info>' . $this->user->lang('CLI_CONFIG_SET_SUCCESS', $key) . '</info>');
 	}
 }
diff --git a/phpBB/phpbb/console/command/config/set_atomic.php b/phpBB/phpbb/console/command/config/set_atomic.php
index a7a52155f9..e8c69a0885 100644
--- a/phpBB/phpbb/console/command/config/set_atomic.php
+++ b/phpBB/phpbb/console/command/config/set_atomic.php
@@ -26,27 +26,27 @@ class set_atomic extends command
 	{
 		$this
 			->setName('config:set-atomic')
-			->setDescription("Sets a configuration option's value only if the old matches the current value.")
+			->setDescription($this->user->lang('CLI_DESCRIPTION_SET_ATOMIC_CONFIG'))
 			->addArgument(
 				'key',
 				InputArgument::REQUIRED,
-				"The configuration option's name"
+				$this->user->lang('CLI_CONFIG_OPTION_NAME')
 			)
 			->addArgument(
 				'old',
 				InputArgument::REQUIRED,
-				'Current configuration value, use 0 and 1 to specify boolean values'
+				$this->user->lang('CLI_CONFIG_CURRENT')
 			)
 			->addArgument(
 				'new',
 				InputArgument::REQUIRED,
-				'New configuration value, use 0 and 1 to specify boolean values'
+				$this->user->lang('CLI_CONFIG_NEW')
 			)
 			->addOption(
 				'dynamic',
 				'd',
 				InputOption::VALUE_NONE,
-				'Set this option if the configuration option changes too frequently to be efficiently cached.'
+				$this->user->lang('CLI_CONFIG_CANNOT_CACHED')
 			)
 		;
 	}
@@ -72,12 +72,12 @@ class set_atomic extends command
 
 		if ($this->config->set_atomic($key, $old_value, $new_value, $use_cache))
 		{
-			$output->writeln("<info>Successfully set config $key</info>");
+			$output->writeln('<info>' . $this->user->lang('CLI_CONFIG_SET_SUCCESS', $key) . '</info>');
 			return 0;
 		}
 		else
 		{
-			$output->writeln("<error>Could not set config $key</error>");
+			$output->writeln('<error>' . $this->user->lang('CLI_CONFIG_SET_FAILURE', $key) . '</error>');
 			return 1;
 		}
 	}
diff --git a/phpBB/phpbb/console/command/db/migrate.php b/phpBB/phpbb/console/command/db/migrate.php
index 758b125b13..bb5f83b16f 100644
--- a/phpBB/phpbb/console/command/db/migrate.php
+++ b/phpBB/phpbb/console/command/db/migrate.php
@@ -47,7 +47,7 @@ class migrate extends \phpbb\console\command\command
 	{
 		$this
 			->setName('db:migrate')
-			->setDescription('Updates the database by applying migrations.')
+			->setDescription($this->user->lang('CLI_DESCRIPTION_DB_MIGRATE'))
 		;
 	}
 
diff --git a/phpBB/phpbb/console/command/dev/migration_tips.php b/phpBB/phpbb/console/command/dev/migration_tips.php
index e1387b34ae..f9047bdac8 100644
--- a/phpBB/phpbb/console/command/dev/migration_tips.php
+++ b/phpBB/phpbb/console/command/dev/migration_tips.php
@@ -30,7 +30,7 @@ class migration_tips extends \phpbb\console\command\command
 	{
 		$this
 			->setName('dev:migration-tips')
-			->setDescription('Finds migrations that are not depended on.')
+			->setDescription($this->user->lang('CLI_DESCRIPTION_FIND_MIGRATIONS'))
 		;
 	}
 
diff --git a/phpBB/phpbb/console/command/extension/disable.php b/phpBB/phpbb/console/command/extension/disable.php
index c04848aa01..1eee16cbd9 100644
--- a/phpBB/phpbb/console/command/extension/disable.php
+++ b/phpBB/phpbb/console/command/extension/disable.php
@@ -22,11 +22,11 @@ class disable extends command
 	{
 		$this
 			->setName('extension:disable')
-			->setDescription('Disables the specified extension.')
+			->setDescription($this->user->lang('CLI_DESCRIPTION_DISABLE_EXTENSION'))
 			->addArgument(
 				'extension-name',
 				InputArgument::REQUIRED,
-				'Name of the extension'
+				$this->user->lang('CLI_EXTENSION_NAME')
 			)
 		;
 	}
@@ -39,13 +39,13 @@ class disable extends command
 
 		if ($this->manager->is_enabled($name))
 		{
-			$output->writeln("<error>Could not disable extension $name</error>");
+			$output->writeln('<error>' . $this->user->lang('CLI_EXTENSION_DISABLE_FAILURE', $name) . '</error>');
 			return 1;
 		}
 		else
 		{
 			$this->log->add('admin', ANONYMOUS, '', 'LOG_EXT_DISABLE', time(), array($name));
-			$output->writeln("<info>Successfully disabled extension $name</info>");
+			$output->writeln('<info>' . $this->user->lang('CLI_EXTENSION_DISABLE_SUCCESS', $name) . '</info>');
 			return 0;
 		}
 	}
diff --git a/phpBB/phpbb/console/command/extension/enable.php b/phpBB/phpbb/console/command/extension/enable.php
index 86a034cdf4..cca4975aa6 100644
--- a/phpBB/phpbb/console/command/extension/enable.php
+++ b/phpBB/phpbb/console/command/extension/enable.php
@@ -22,11 +22,11 @@ class enable extends command
 	{
 		$this
 			->setName('extension:enable')
-			->setDescription('Enables the specified extension.')
+			->setDescription($this->user->lang('CLI_DESCRIPTION_ENABLE_EXTENSION'))
 			->addArgument(
 				'extension-name',
 				InputArgument::REQUIRED,
-				'Name of the extension'
+				$this->user->lang('CLI_EXTENSION_NAME')
 			)
 		;
 	}
@@ -40,12 +40,12 @@ class enable extends command
 		if ($this->manager->is_enabled($name))
 		{
 			$this->log->add('admin', ANONYMOUS, '', 'LOG_EXT_ENABLE', time(), array($name));
-			$output->writeln("<info>Successfully enabled extension $name</info>");
+			$output->writeln('<error>' . $this->user->lang('CLI_EXTENSION_ENABLE_FAILURE', $name) . '</error>');
 			return 0;
 		}
 		else
 		{
-			$output->writeln("<error>Could not enable extension $name</error>");
+			$output->writeln('<info>' . $this->user->lang('CLI_EXTENSION_ENABLE_SUCCESS', $name) . '</info>');
 			return 1;
 		}
 	}
diff --git a/phpBB/phpbb/console/command/extension/purge.php b/phpBB/phpbb/console/command/extension/purge.php
index 841598b90a..517e9a74c9 100644
--- a/phpBB/phpbb/console/command/extension/purge.php
+++ b/phpBB/phpbb/console/command/extension/purge.php
@@ -22,11 +22,11 @@ class purge extends command
 	{
 		$this
 			->setName('extension:purge')
-			->setDescription('Purges the specified extension.')
+			->setDescription($this->user->lang('CLI_DESCRIPTION_PURGE_EXTENSION'))
 			->addArgument(
 				'extension-name',
 				InputArgument::REQUIRED,
-				'Name of the extension'
+				$this->user->lang('CLI_EXTENSION_NAME')
 			)
 		;
 	}
@@ -39,13 +39,13 @@ class purge extends command
 
 		if ($this->manager->is_enabled($name))
 		{
-			$output->writeln("<error>Could not purge extension $name</error>");
+			$output->writeln('<error>' . $this->user->lang('CLI_EXTENSION_PURGE_FAILURE', $name) . '</error>');
 			return 1;
 		}
 		else
 		{
 			$this->log->add('admin', ANONYMOUS, '', 'LOG_EXT_PURGE', time(), array($name));
-			$output->writeln("<info>Successfully purge extension $name</info>");
+			$output->writeln('<info>' . $this->user->lang('CLI_EXTENSION_PURGE_SUCCESS', $name) . '</info>');
 			return 0;
 		}
 	}
diff --git a/phpBB/phpbb/console/command/extension/show.php b/phpBB/phpbb/console/command/extension/show.php
index 2db1c59e24..6ce9607098 100644
--- a/phpBB/phpbb/console/command/extension/show.php
+++ b/phpBB/phpbb/console/command/extension/show.php
@@ -21,7 +21,7 @@ class show extends command
 	{
 		$this
 			->setName('extension:show')
-			->setDescription('Lists all extensions in the database and on the filesystem.')
+			->setDescription($this->user->lang('CLI_DESCRIPTION_LIST_EXTENSIONS'))
 		;
 	}
 
@@ -32,7 +32,7 @@ class show extends command
 
 		if (empty($all))
 		{
-			$output->writeln('<comment>No extensions were found.</comment>');
+			$output->writeln('<comment>' . $this->user->lang('CLI_EXTENSION_NOT_FOUND') . '</comment>');
 			return 3;
 		}
 
diff --git a/phpBB/phpbb/console/command/fixup/recalculate_email_hash.php b/phpBB/phpbb/console/command/fixup/recalculate_email_hash.php
index cb821cfe20..ec4e1b0ee7 100644
--- a/phpBB/phpbb/console/command/fixup/recalculate_email_hash.php
+++ b/phpBB/phpbb/console/command/fixup/recalculate_email_hash.php
@@ -31,7 +31,7 @@ class recalculate_email_hash extends \phpbb\console\command\command
 	{
 		$this
 			->setName('fixup:recalculate-email-hash')
-			->setDescription('Recalculates the user_email_hash column of the users table.')
+			->setDescription($this->user->lang('CLI_DESCRIPTION_RECALCULATE_EMAIL_HASH'))
 		;
 	}
 
@@ -70,6 +70,6 @@ class recalculate_email_hash extends \phpbb\console\command\command
 		}
 		$this->db->sql_freeresult($result);
 
-		$output->writeln('<info>Successfully recalculated all email hashes.</info>');
+		$output->writeln('<info>' . $this->user->lang('CLI_FIXUP_RECALCULATE_EMAIL_HASH_SUCCESS') . '</info>');
 	}
 }
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/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.