14 files changed, 77 insertions, 83 deletions
diff --git a/phpBB/phpbb/controller/provider.php b/phpBB/phpbb/controller/provider.php
index fffd4f0428..7e26848290 100644
--- a/phpBB/phpbb/controller/provider.php
+++ b/phpBB/phpbb/controller/provider.php
@@ -73,7 +73,7 @@ class provider
 		$this->routes = new RouteCollection;
 		foreach ($this->routing_files as $file_path)
 		{
-			$loader = new YamlFileLoader(new FileLocator($base_path));
+			$loader = new YamlFileLoader(new FileLocator(phpbb_realpath($base_path)));
 			$this->routes->addCollection($loader->load($file_path));
 		}
 
diff --git a/phpBB/phpbb/db/migration/data/v310/notifications_use_full_name.php b/phpBB/phpbb/db/migration/data/v310/notifications_use_full_name.php
index 30168f4b0b..f749b32119 100644
--- a/phpBB/phpbb/db/migration/data/v310/notifications_use_full_name.php
+++ b/phpBB/phpbb/db/migration/data/v310/notifications_use_full_name.php
@@ -85,6 +85,11 @@ class notifications_use_full_name extends \phpbb\db\migration\migration
 
 	public function update_notifications_name()
 	{
+		$sql = 'UPDATE ' . NOTIFICATION_TYPES_TABLE . '
+			SET notification_type_enabled = 0
+			WHERE ' . $this->db->sql_in_set('notification_type_name', $this->notification_types, true);
+		$this->db->sql_query($sql);
+
 		foreach ($this->notification_types as $notification_type)
 		{
 			$sql = 'UPDATE ' . NOTIFICATION_TYPES_TABLE . "
diff --git a/phpBB/phpbb/db/migrator.php b/phpBB/phpbb/db/migrator.php
index 8bc63e564a..44bea3c5d2 100644
--- a/phpBB/phpbb/db/migrator.php
+++ b/phpBB/phpbb/db/migrator.php
@@ -715,60 +715,6 @@ class migrator
 	}
 
 	/**
-	* Load migration data files from a directory
-	*
-	* @param \phpbb\finder $finder
-	* @param string $path Path to migration data files
-	* @param bool $check_fulfillable If TRUE (default), we will check
-	* 	if all of the migrations are fulfillable after loading them.
-	* 	If FALSE, we will not check. You SHOULD check at least once
-	* 	to prevent errors (if including multiple directories, check
-	* 	with the last call to prevent throwing errors unnecessarily).
-	* @return array Array of migration names
-	* @throws \phpbb\db\migration\exception
-	*/
-	public function load_migrations(\phpbb\finder $finder, $path, $check_fulfillable = true)
-	{
-		if (!is_dir($path))
-		{
-			throw new \phpbb\db\migration\exception('DIRECTORY INVALID', $path);
-		}
-
-		$migrations = array();
-
-		$files = $finder
-			->extension_directory("/")
-			->find_from_paths(array('/' => $path));
-		foreach ($files as $file)
-		{
-			$migrations[$file['path'] . $file['filename']] = '';
-		}
-		$migrations = $finder->get_classes_from_files($migrations);
-
-		foreach ($migrations as $migration)
-		{
-			if (!in_array($migration, $this->migrations))
-			{
-				$this->migrations[] = $migration;
-			}
-		}
-
-		if ($check_fulfillable)
-		{
-			foreach ($this->migrations as $name)
-			{
-				$unfulfillable = $this->unfulfillable($name);
-				if ($unfulfillable !== false)
-				{
-					throw new \phpbb\db\migration\exception('MIGRATION_NOT_FULFILLABLE', $name, $unfulfillable);
-				}
-			}
-		}
-
-		return $this->migrations;
-	}
-
-	/**
 	* Creates the migrations table if it does not exist.
 	* @return null
 	*/
diff --git a/phpBB/phpbb/feed/forum.php b/phpBB/phpbb/feed/forum.php
index 610b755af3..7a2087c1cd 100644
--- a/phpBB/phpbb/feed/forum.php
+++ b/phpBB/phpbb/feed/forum.php
@@ -94,7 +94,7 @@ class forum extends \phpbb\feed\post_base
 			WHERE forum_id = ' . $this->forum_id . '
 				AND topic_moved_id = 0
 				AND ' . $this->content_visibility->get_visibility_sql('topic', $this->forum_id) . '
-			ORDER BY topic_last_post_time DESC';
+			ORDER BY topic_last_post_time DESC, topic_last_post_id DESC';
 		$result = $this->db->sql_query_limit($sql, $this->num_items);
 
 		$topic_ids = array();
@@ -123,7 +123,7 @@ class forum extends \phpbb\feed\post_base
 							AND ' . $this->content_visibility->get_visibility_sql('post', $this->forum_id, 'p.') . '
 							AND p.post_time >= ' . $min_post_time . '
 							AND p.poster_id = u.user_id',
-			'ORDER_BY'	=> 'p.post_time DESC',
+			'ORDER_BY'	=> 'p.post_time DESC, p.post_id DESC',
 		);
 
 		return true;
diff --git a/phpBB/phpbb/feed/news.php b/phpBB/phpbb/feed/news.php
index ea5f4febf5..a02c199d85 100644
--- a/phpBB/phpbb/feed/news.php
+++ b/phpBB/phpbb/feed/news.php
@@ -99,7 +99,7 @@ class news extends \phpbb\feed\topic_base
 			),
 			'WHERE'		=> 'p.topic_id = t.topic_id
 							AND ' . $this->db->sql_in_set('p.post_id', $post_ids),
-			'ORDER_BY'	=> 'p.post_time DESC',
+			'ORDER_BY'	=> 'p.post_time DESC, p.post_id DESC',
 		);
 
 		return true;
diff --git a/phpBB/phpbb/feed/overall.php b/phpBB/phpbb/feed/overall.php
index f6847c041e..ab452f5386 100644
--- a/phpBB/phpbb/feed/overall.php
+++ b/phpBB/phpbb/feed/overall.php
@@ -34,7 +34,7 @@ class overall extends \phpbb\feed\post_base
 			FROM ' . TOPICS_TABLE . '
 			WHERE topic_moved_id = 0
 				AND ' . $this->content_visibility->get_forums_visibility_sql('topic', $forum_ids) . '
-			ORDER BY topic_last_post_time DESC';
+			ORDER BY topic_last_post_time DESC, topic_last_post_id DESC';
 		$result = $this->db->sql_query_limit($sql, $this->num_items);
 
 		$topic_ids = array();
@@ -71,7 +71,7 @@ class overall extends \phpbb\feed\post_base
 							AND ' . $this->content_visibility->get_forums_visibility_sql('post', $forum_ids, 'p.') . '
 							AND p.post_time >= ' . $min_post_time . '
 							AND u.user_id = p.poster_id',
-			'ORDER_BY'	=> 'p.post_time DESC',
+			'ORDER_BY'	=> 'p.post_time DESC, p.post_id DESC',
 		);
 
 		return true;
diff --git a/phpBB/phpbb/feed/topic.php b/phpBB/phpbb/feed/topic.php
index 78e0b4b8ab..66c49e55cf 100644
--- a/phpBB/phpbb/feed/topic.php
+++ b/phpBB/phpbb/feed/topic.php
@@ -101,7 +101,7 @@ class topic extends \phpbb\feed\post_base
 			'WHERE'		=> 'p.topic_id = ' . $this->topic_id . '
 								AND ' . $this->content_visibility->get_visibility_sql('post', $this->forum_id, 'p.') . '
 								AND p.poster_id = u.user_id',
-			'ORDER_BY'	=> 'p.post_time DESC',
+			'ORDER_BY'	=> 'p.post_time DESC, p.post_id DESC',
 		);
 
 		return true;
diff --git a/phpBB/phpbb/feed/topics.php b/phpBB/phpbb/feed/topics.php
index 88ca7c33f3..2b9cb3501a 100644
--- a/phpBB/phpbb/feed/topics.php
+++ b/phpBB/phpbb/feed/topics.php
@@ -71,7 +71,7 @@ class topics extends \phpbb\feed\topic_base
 			),
 			'WHERE'		=> 'p.topic_id = t.topic_id
 							AND ' . $this->db->sql_in_set('p.post_id', $post_ids),
-			'ORDER_BY'	=> 'p.post_time DESC',
+			'ORDER_BY'	=> 'p.post_time DESC, p.post_id DESC',
 		);
 
 		return true;
diff --git a/phpBB/phpbb/feed/topics_active.php b/phpBB/phpbb/feed/topics_active.php
index cde6d36f45..6d5eddfc16 100644
--- a/phpBB/phpbb/feed/topics_active.php
+++ b/phpBB/phpbb/feed/topics_active.php
@@ -56,7 +56,7 @@ class topics_active extends \phpbb\feed\topic_base
 			WHERE topic_moved_id = 0
 				AND ' . $this->content_visibility->get_forums_visibility_sql('topic', $in_fid_ary) . '
 				' . $last_post_time_sql . '
-			ORDER BY topic_last_post_time DESC';
+			ORDER BY topic_last_post_time DESC, topic_last_post_id DESC';
 		$result = $this->db->sql_query_limit($sql, $this->num_items);
 
 		$post_ids = array();
@@ -88,7 +88,7 @@ class topics_active extends \phpbb\feed\topic_base
 			),
 			'WHERE'		=> 'p.topic_id = t.topic_id
 							AND ' . $this->db->sql_in_set('p.post_id', $post_ids),
-			'ORDER_BY'	=> 'p.post_time DESC',
+			'ORDER_BY'	=> 'p.post_time DESC, p.post_id DESC',
 		);
 
 		return true;
diff --git a/phpBB/phpbb/mimetype/guesser.php b/phpBB/phpbb/mimetype/guesser.php
index 773a1f822a..8baa77089b 100644
--- a/phpBB/phpbb/mimetype/guesser.php
+++ b/phpBB/phpbb/mimetype/guesser.php
@@ -115,17 +115,42 @@ class guesser
 			return false;
 		}
 
+		$mimetype = 'application/octet-stream';
+
 		foreach ($this->guessers as $guesser)
 		{
-			$mimetype = $guesser->guess($file, $file_name);
+			$mimetype_guess = $guesser->guess($file, $file_name);
 
-			// Try to guess something that is not the fallback application/octet-stream
-			if ($mimetype !== null && $mimetype !== 'application/octet-stream')
-			{
-				return $mimetype;
-			}
+			$mimetype = $this->choose_mime_type($mimetype, $mimetype_guess);
 		}
 		// Return any mimetype if we got a result or the fallback value
-		return (!empty($mimetype)) ? $mimetype : 'application/octet-stream';
+		return $mimetype;
+	}
+
+	/**
+	 * Choose the best mime type based on the current mime type and the guess
+	 * If a guesser returns nulls or application/octet-stream, we will keep
+	 * the current guess. Guesses with a slash inside them will be favored over
+	 * already existing ones. However, any guess that will pass the first check
+	 * will always overwrite the default application/octet-stream.
+	 *
+	 * @param	string	$mime_type	The current mime type
+	 * @param	string	$guess		The current mime type guess
+	 *
+	 * @return string The best mime type based on current mime type and guess
+	 */
+	public function choose_mime_type($mime_type, $guess)
+	{
+		if ($guess === null || $guess == 'application/octet-stream')
+		{
+			return $mime_type;
+		}
+
+		if ($mime_type == 'application/octet-stream' || strpos($guess, '/') !== false)
+		{
+			$mime_type = $guess;
+		}
+
+		return $mime_type;
 	}
 }
diff --git a/phpBB/phpbb/path_helper.php b/phpBB/phpbb/path_helper.php
index 38dbbab51e..936564d8b6 100644
--- a/phpBB/phpbb/path_helper.php
+++ b/phpBB/phpbb/path_helper.php
@@ -316,7 +316,7 @@ class path_helper
 	* Glue URL parameters together
 	*
 	* @param array $params URL parameters in the form of array(name => value)
-	* @return string Returns the glued string, e.g. name1=value1&amp;name2=value2
+	* @return string Returns the glued string, e.g. name1=value1&amp;name2&amp;name3=value3
 	*/
 	public function glue_url_params($params)
 	{
@@ -324,7 +324,15 @@ class path_helper
 
 		foreach ($params as $key => $value)
 		{
-			$_params[] = $key . '=' . $value;
+			// some parameters do not have value
+			if ($value !== null)
+			{
+				$_params[] = $key . '=' . $value;
+			}
+			else
+			{
+				$_params[] = $key;
+			}
 		}
 		return implode('&amp;', $_params);
 	}
@@ -353,7 +361,17 @@ class path_helper
 				{
 					continue;
 				}
-				list($key, $value) = explode('=', $argument, 2);
+
+				// some parameters don't have value
+				if (strpos($argument, '=') !== false)
+				{
+					list($key, $value) = explode('=', $argument, 2);
+				}
+				else
+				{
+					$key = $argument;
+					$value = null;
+				}
 
 				if ($key === '')
 				{
diff --git a/phpBB/phpbb/profilefields/manager.php b/phpBB/phpbb/profilefields/manager.php
index 98802d2209..4ad3214ae4 100644
--- a/phpBB/phpbb/profilefields/manager.php
+++ b/phpBB/phpbb/profilefields/manager.php
@@ -245,12 +245,8 @@ class manager
 			$cp_data = $this->build_insert_sql_array($cp_data);
 			$cp_data['user_id'] = (int) $user_id;
 
-			$this->db->sql_return_on_error(true);
-
 			$sql = 'INSERT INTO ' . $this->fields_data_table . ' ' . $this->db->sql_build_array('INSERT', $cp_data);
 			$this->db->sql_query($sql);
-
-			$this->db->sql_return_on_error(false);
 		}
 	}
 
@@ -328,7 +324,7 @@ class manager
 		* Event to modify profile fields data retrieved from the database
 		*
 		* @event core.grab_profile_fields_data
-		* @var	array	user_ids		Single user id or an array of ids 
+		* @var	array	user_ids		Single user id or an array of ids
 		* @var	array	field_data		Array with profile fields data
 		* @since 3.1.0-b3
 		*/
@@ -377,7 +373,7 @@ class manager
 		* Event to modify data of the generated profile fields, before the template assignment loop
 		*
 		* @event core.generate_profile_fields_template_data_before
-		* @var	array	profile_row		Array with users profile field data 
+		* @var	array	profile_row		Array with users profile field data
 		* @var	array	tpl_fields		Array with template data fields
 		* @var	bool	use_contact_fields	Should we display contact fields as such?
 		* @since 3.1.0-b3
@@ -445,7 +441,7 @@ class manager
 		* Event to modify template data of the generated profile fields
 		*
 		* @event core.generate_profile_fields_template_data
-		* @var	array	profile_row		Array with users profile field data 
+		* @var	array	profile_row		Array with users profile field data
 		* @var	array	tpl_fields		Array with template data fields
 		* @var	bool	use_contact_fields	Should we display contact fields as such?
 		* @since 3.1.0-b3
diff --git a/phpBB/phpbb/session.php b/phpBB/phpbb/session.php
index 7d564742af..30b364821d 100644
--- a/phpBB/phpbb/session.php
+++ b/phpBB/phpbb/session.php
@@ -441,8 +441,8 @@ class session
 
 					if (!$session_expired)
 					{
-						// Only update session DB a minute or so after last update or if page changes
-						if ($this->time_now - $this->data['session_time'] > 60 || ($this->update_session_page && $this->data['session_page'] != $this->page['page']))
+						// Only update session DB a minute or so after last update or if page changes and is not ajax request
+						if (($this->time_now - $this->data['session_time'] > 60 || ($this->update_session_page && $this->data['session_page'] != $this->page['page'])) && !$request->is_ajax())
 						{
 							$sql_ary = array('session_time' => $this->time_now);
 
diff --git a/phpBB/phpbb/template/twig/twig.php b/phpBB/phpbb/template/twig/twig.php
index 5e2057f818..a3b002f350 100644
--- a/phpBB/phpbb/template/twig/twig.php
+++ b/phpBB/phpbb/template/twig/twig.php
@@ -177,6 +177,10 @@ class twig extends \phpbb\template\base
 		}
 
 		$names = $this->get_user_style();
+		// Add 'all' folder to $names array
+		//	It allows extensions to load a template file from 'all' folder,
+		//	if a style doesn't include it.
+		$names[] = 'all';
 
 		$paths = array();
 		foreach ($style_directories as $directory)