8 files changed, 44 insertions, 18 deletions
diff --git a/phpBB/phpbb/avatar/driver/local.php b/phpBB/phpbb/avatar/driver/local.php
index 8b773017c5..4b84e4201c 100644
--- a/phpBB/phpbb/avatar/driver/local.php
+++ b/phpBB/phpbb/avatar/driver/local.php
@@ -158,7 +158,7 @@ class local extends \phpbb\avatar\driver\driver
 	*/
 	protected function get_avatar_list($user)
 	{
-		$avatar_list = ($this->cache == null) ? false : $this->cache->get('_avatar_local_list');
+		$avatar_list = ($this->cache == null) ? false : $this->cache->get('_avatar_local_list_' . $user->data['user_lang']);
 
 		if ($avatar_list === false)
 		{
@@ -198,7 +198,7 @@ class local extends \phpbb\avatar\driver\driver
 
 			if ($this->cache != null)
 			{
-				$this->cache->put('_avatar_local_list', $avatar_list, 86400);
+				$this->cache->put('_avatar_local_list_' . $user->data['user_lang'], $avatar_list, 86400);
 			}
 		}
 
diff --git a/phpBB/phpbb/db/migration/data/v320/add_help_phpbb.php b/phpBB/phpbb/db/migration/data/v320/add_help_phpbb.php
index a52067f484..804adc4490 100644
--- a/phpBB/phpbb/db/migration/data/v320/add_help_phpbb.php
+++ b/phpBB/phpbb/db/migration/data/v320/add_help_phpbb.php
@@ -32,10 +32,7 @@ class add_help_phpbb extends \phpbb\db\migration\migration
 		return array(
 			array('config.add', array('help_send_statistics', true)),
 			array('config.add', array('help_send_statistics_time', 0)),
-			array('if', array(
-				array('module.exists', array('acp', false, 'ACP_SEND_STATISTICS')),
-				array('module.remove', array('acp', false, 'ACP_SEND_STATISTICS')),
-			)),
+			array('module.remove', array('acp', false, 'ACP_SEND_STATISTICS')),
 			array('module.add', array(
 				'acp',
 				'ACP_SERVER_CONFIGURATION',
diff --git a/phpBB/phpbb/db/migration/tool/module.php b/phpBB/phpbb/db/migration/tool/module.php
index e24c78e228..3893935723 100644
--- a/phpBB/phpbb/db/migration/tool/module.php
+++ b/phpBB/phpbb/db/migration/tool/module.php
@@ -519,12 +519,6 @@ class module implements \phpbb\db\migration\tool\tool_interface
 		// Allow '' to be sent as 0
 		$parent_id = $parent_id ?: 0;
 
-		// If automatic adding is in action, convert array back to string to simplify things
-		if (is_array($data) && count($data) == 1)
-		{
-			$data = $data['module_langname'];
-		}
-
 		if (!is_numeric($parent_id))
 		{
 			// Refresh the $module_categories array
diff --git a/phpBB/phpbb/db/migrator.php b/phpBB/phpbb/db/migrator.php
index a425df56e8..2b0c66fc58 100644
--- a/phpBB/phpbb/db/migrator.php
+++ b/phpBB/phpbb/db/migrator.php
@@ -760,7 +760,7 @@ class migrator
 
 				$condition = $parameters[0];
 
-				if (!$condition)
+				if (!$condition || (is_array($condition) && !$this->run_step($condition, $last_result, $reverse)))
 				{
 					return false;
 				}
diff --git a/phpBB/phpbb/event/php_exporter.php b/phpBB/phpbb/event/php_exporter.php
index 64d1e429b7..71c94a681d 100644
--- a/phpBB/phpbb/event/php_exporter.php
+++ b/phpBB/phpbb/event/php_exporter.php
@@ -264,7 +264,30 @@ class php_exporter
 
 					// Find event description line
 					$description_line_num = $this->find_description();
-					$description = substr(trim($this->file_lines[$description_line_num]), strlen('* '));
+					$description_lines = array();
+
+					while (true)
+					{
+						$description_line = substr(trim($this->file_lines[$description_line_num]), strlen('*'));
+						$description_line = trim(str_replace("\t", " ", $description_line));
+
+						// Reached end of description if line is a tag
+						if (strlen($description_line) && $description_line[0] == '@')
+						{
+							break;
+						}
+
+						$description_lines[] = $description_line;
+						$description_line_num++;
+					}
+
+					// If there is an empty line between description and first tag, remove it
+					if (!strlen(end($description_lines)))
+					{
+						array_pop($description_lines);
+					}
+
+					$description = trim(implode('<br/>', $description_lines));
 
 					if (isset($this->events[$this->current_event]))
 					{
diff --git a/phpBB/phpbb/session.php b/phpBB/phpbb/session.php
index de9345ca85..80934dc411 100644
--- a/phpBB/phpbb/session.php
+++ b/phpBB/phpbb/session.php
@@ -1614,13 +1614,15 @@ class session
 			return;
 		}
 
+		// Do not update the session page for ajax requests, so the view online still works as intended
+		$page_changed = $this->update_session_page && $this->data['session_page'] != $this->page['page'] && !$request->is_ajax();
+
 		// Only update session DB a minute or so after last update or if page changes
-		if ($this->time_now - ((isset($this->data['session_time'])) ? $this->data['session_time'] : 0) > 60 || ($this->update_session_page && $this->data['session_page'] != $this->page['page']))
+		if ($this->time_now - (isset($this->data['session_time']) ? $this->data['session_time'] : 0) > 60 || $page_changed)
 		{
 			$sql_ary = array('session_time' => $this->time_now);
 
-			// Do not update the session page for ajax requests, so the view online still works as intended
-			if ($this->update_session_page && !$request->is_ajax())
+			if ($page_changed)
 			{
 				$sql_ary['session_page'] = substr($this->page['page'], 0, 199);
 				$sql_ary['session_forum_id'] = $this->page['forum'];
diff --git a/phpBB/phpbb/template/context.php b/phpBB/phpbb/template/context.php
index de583d3224..2ba6d185ad 100644
--- a/phpBB/phpbb/template/context.php
+++ b/phpBB/phpbb/template/context.php
@@ -274,6 +274,11 @@ class context
 			{
 				$name = substr($blocks[$i], 0, $pos);
 
+				if (empty($block[$name]))
+				{
+					return array();
+				}
+
 				if (strpos($blocks[$i], '[]') === $pos)
 				{
 					$index = count($block[$name]) - 1;
@@ -286,6 +291,11 @@ class context
 			else
 			{
 				$name = $blocks[$i];
+				if (empty($block[$name]))
+				{
+					return array();
+				}
+
 				$index = count($block[$name]) - 1;
 			}
 			$block = $block[$name];
diff --git a/phpBB/phpbb/template/twig/extension.php b/phpBB/phpbb/template/twig/extension.php
index 1aa7717470..f6f8e03ca2 100644
--- a/phpBB/phpbb/template/twig/extension.php
+++ b/phpBB/phpbb/template/twig/extension.php
@@ -172,7 +172,7 @@ class extension extends \Twig_Extension
 
 		$context_vars = $this->context->get_root_ref();
 
-		if (isset($context_vars['L_' . $key]))
+		if (is_string($key) && isset($context_vars['L_' . $key]))
 		{
 			return $context_vars['L_' . $key];
 		}