8 files changed, 113 insertions, 18 deletions
diff --git a/phpBB/phpbb/console/command/cache/purge.php b/phpBB/phpbb/console/command/cache/purge.php
index ec8229200c..d0c2ef6f72 100644
--- a/phpBB/phpbb/console/command/cache/purge.php
+++ b/phpBB/phpbb/console/command/cache/purge.php
@@ -26,7 +26,7 @@ class purge extends \phpbb\console\command\command
 	/** @var \phpbb\auth\auth */
 	protected $auth;
 
-	/** @var \phpbb\log\log */
+	/** @var \phpbb\log\log_interface */
 	protected $log;
 
 	/** @var \phpbb\config\config */
@@ -42,7 +42,7 @@ class purge extends \phpbb\console\command\command
 	* @param \phpbb\log\log							$log	Logger instance
 	* @param \phpbb\config\config					$config	Config instance
 	*/
-	public function __construct(\phpbb\user $user, \phpbb\cache\driver\driver_interface $cache, \phpbb\db\driver\driver_interface $db, \phpbb\auth\auth $auth, \phpbb\log\log $log, \phpbb\config\config $config)
+	public function __construct(\phpbb\user $user, \phpbb\cache\driver\driver_interface $cache, \phpbb\db\driver\driver_interface $db, \phpbb\auth\auth $auth, \phpbb\log\log_interface $log, \phpbb\config\config $config)
 	{
 		$this->cache = $cache;
 		$this->db = $db;
diff --git a/phpBB/phpbb/controller/helper.php b/phpBB/phpbb/controller/helper.php
index fc19b855c0..187e455d48 100644
--- a/phpBB/phpbb/controller/helper.php
+++ b/phpBB/phpbb/controller/helper.php
@@ -140,14 +140,17 @@ class helper
 		// If enable_mod_rewrite is false we need to replace the current front-end by app.php, otherwise we need to remove it.
 		$base_url = str_replace('/' . $page_name, empty($this->config['enable_mod_rewrite']) ? '/app.' . $this->php_ext : '', $base_url);
 
-		// We need to update the base url to move to the directory of the app.php file
-		if (empty($this->config['enable_mod_rewrite']))
+		// We need to update the base url to move to the directory of the app.php file if the current script is not app.php
+		if ($page_name !== 'app.php')
 		{
-			$base_url = str_replace('/app.' . $this->php_ext, '/' . $this->phpbb_root_path . 'app.' . $this->php_ext, $base_url);
-		}
-		else
-		{
-			$base_url .= preg_replace(get_preg_expression('path_remove_dot_trailing_slash'), '$2', $this->phpbb_root_path);
+			if (empty($this->config['enable_mod_rewrite']))
+			{
+				$base_url = str_replace('/app.' . $this->php_ext, '/' . $this->phpbb_root_path . 'app.' . $this->php_ext, $base_url);
+			}
+			else
+			{
+				$base_url .= preg_replace(get_preg_expression('path_remove_dot_trailing_slash'), '$2', $this->phpbb_root_path);
+			}
 		}
 
 		$base_url = $this->filesystem->clean_path($base_url);
diff --git a/phpBB/phpbb/db/migration/data/v310/remove_acp_styles_cache.php b/phpBB/phpbb/db/migration/data/v310/remove_acp_styles_cache.php
new file mode 100644
index 0000000000..7b84539814
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v310/remove_acp_styles_cache.php
@@ -0,0 +1,51 @@
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
+
+namespace phpbb\db\migration\data\v310;
+
+class remove_acp_styles_cache extends \phpbb\db\migration\migration
+{
+	public function effectively_installed()
+	{
+		$sql = 'SELECT module_id
+			FROM ' . MODULES_TABLE . "
+			WHERE module_class = 'acp'
+				AND module_langname = 'ACP_STYLES_CACHE'";
+		$result = $this->db->sql_query($sql);
+		$module_id = $this->db->sql_fetchfield('module_id');
+		$this->db->sql_freeresult($result);
+
+		return !$module_id;
+	}
+
+	static public function depends_on()
+	{
+		return array('\phpbb\db\migration\data\v310\rc4');
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('module.remove', array(
+				'acp',
+				'ACP_STYLE_MANAGEMENT',
+				array(
+					'module_basename'   => 'acp_styles',
+					'module_langname'   => 'ACP_STYLES_CACHE',
+					'module_mode'       => 'cache',
+					'module_auth'       => 'acl_a_styles',
+				),
+			)),
+		);
+	}
+}
diff --git a/phpBB/phpbb/db/tools.php b/phpBB/phpbb/db/tools.php
index 3567570137..0781d7425e 100644
--- a/phpBB/phpbb/db/tools.php
+++ b/phpBB/phpbb/db/tools.php
@@ -1512,7 +1512,7 @@ class tools
 					$sql .= (strpos($column_data[1], '0x') === 0) ? "DEFAULT {$column_data[1]} " : "DEFAULT '{$column_data[1]}' ";
 				}
 
-				if (!is_null($column_data[1]))
+				if (!is_null($column_data[1]) || (isset($column_data[2]) && $column_data[2] == 'auto_increment'))
 				{
 					$sql .= 'NOT NULL';
 				}
diff --git a/phpBB/phpbb/pagination.php b/phpBB/phpbb/pagination.php
index 8aba41d651..7a81c25ad2 100644
--- a/phpBB/phpbb/pagination.php
+++ b/phpBB/phpbb/pagination.php
@@ -21,18 +21,26 @@ class pagination
 	/** @var \phpbb\user */
 	protected $user;
 
+	/** @var \phpbb\controller\helper */
+	protected $helper;
+
+	/** @var \phpbb\event\dispatcher_interface */
+	protected $phpbb_dispatcher;
+
 	/**
 	* Constructor
 	*
-	* @param	\phpbb\template\template	$template
-	* @param	\phpbb\user					$user
-	* @param	\phpbb\controller\helper	$helper
+	* @param	\phpbb\template\template			$template
+	* @param	\phpbb\user							$user
+	* @param	\phpbb\controller\helper			$helper
+	* @param	\phpbb\event\dispatcher_interface	$phpbb_dispatcher
 	*/
-	public function __construct(\phpbb\template\template $template, \phpbb\user $user, \phpbb\controller\helper $helper)
+	public function __construct(\phpbb\template\template $template, \phpbb\user $user, \phpbb\controller\helper $helper, \phpbb\event\dispatcher_interface $phpbb_dispatcher)
 	{
 		$this->template = $template;
 		$this->user = $user;
 		$this->helper = $helper;
+		$this->phpbb_dispatcher = $phpbb_dispatcher;
 	}
 
 	/**
@@ -50,6 +58,36 @@ class pagination
 	*/
 	protected function generate_page_link($base_url, $on_page, $start_name, $per_page)
 	{
+		// A listener can set this variable to the new pagination URL
+		// to override the generate_page_link() function generated value
+		$generate_page_link_override = false;
+
+		/**
+		* Execute code and/or override generate_page_link()
+		*
+		* To override the generate_page_link() function generated value
+		* set $generate_page_link_override to the new URL value
+		*
+		* @event core.pagination_generate_page_link
+		* @var string base_url is url prepended to all links generated within the function
+		*							If you use page numbers inside your controller route, base_url should contains a placeholder (%d)
+		*							for the page. Also be sure to specify the pagination path information into the start_name argument
+		* @var string on_page is the page for which we want to generate the link
+		* @var string start_name is the name of the parameter containing the first item of the given page (example: start=20)
+		*							If you use page numbers inside your controller route, start name should be the string
+		*							that should be removed for the first page (example: /page/%d)
+		* @var int per_page the number of items, posts, etc. to display per page, used to determine the number of pages to produce
+		* @var bool|string generate_page_link_override Shall we return custom pagination link (string URL) or not (false)
+		* @since 3.1.0-RC5
+		*/
+		$vars = array('base_url', 'on_page', 'start_name', 'per_page', 'generate_page_link_override');
+		extract($this->phpbb_dispatcher->trigger_event('core.pagination_generate_page_link', compact($vars)));
+
+		if ($generate_page_link_override)
+		{
+			return $generate_page_link_override;
+		}
+
 		if (!is_string($base_url))
 		{
 			if (is_array($base_url['routes']))
diff --git a/phpBB/phpbb/profilefields/type/type_base.php b/phpBB/phpbb/profilefields/type/type_base.php
index c770a0d93c..52f5d15511 100644
--- a/phpBB/phpbb/profilefields/type/type_base.php
+++ b/phpBB/phpbb/profilefields/type/type_base.php
@@ -133,7 +133,7 @@ abstract class type_base implements type_interface
 		{
 			foreach ($field_data[$key] as $lang_id => $options)
 			{
-				$field_data[$key][$lang_id] = explode("\n", $options);
+				$field_data[$key][$lang_id] = is_array($options) ? $options : explode("\n", $options);
 			}
 
 			return $current_value;
diff --git a/phpBB/phpbb/user.php b/phpBB/phpbb/user.php
index ea98034434..882e9cef26 100644
--- a/phpBB/phpbb/user.php
+++ b/phpBB/phpbb/user.php
@@ -717,7 +717,7 @@ class user extends \phpbb\session
 			$utc = new \DateTimeZone('UTC');
 		}
 
-		$time = new \phpbb\datetime($this, "@$gmepoch", $utc);
+		$time = new $this->datetime($this, "@$gmepoch", $utc);
 		$time->setTimezone($this->timezone);
 
 		return $time->format($format, $forcedate);
diff --git a/phpBB/phpbb/user_loader.php b/phpBB/phpbb/user_loader.php
index c9707ee432..24e663b150 100644
--- a/phpBB/phpbb/user_loader.php
+++ b/phpBB/phpbb/user_loader.php
@@ -212,7 +212,7 @@ class user_loader
 			return '';
 		}
 
-		if (!function_exists('get_user_rank'))
+		if (!function_exists('phpbb_get_user_rank'))
 		{
 			include($this->phpbb_root_path . 'includes/functions_display.' . $this->php_ext);
 		}
@@ -223,7 +223,10 @@ class user_loader
 			'rank_img_src',
 		);
 
-		get_user_rank($user['user_rank'], (($user['user_id'] == ANONYMOUS) ? false : $user['user_posts']), $rank['rank_title'], $rank['rank_img'], $rank['rank_img_src']);
+		$user_rank_data = phpbb_get_user_rank($user, (($user['user_id'] == ANONYMOUS) ? false : $user['user_posts']));
+		$rank['rank_title'] = $user_rank_data['title'];
+		$rank['rank_img'] = $user_rank_data['img'];
+		$rank['rank_img_src'] = $user_rank_data['img_src'];
 
 		return $rank;
 	}