Merge branch '3.1.x' into 3.2.x

phpBB/phpbb/db/migration/data/v310/alpha1.php

@@ -15,6 +15,11 @@ namespace phpbb\db\migration\data\v310;
 
 class alpha1 extends \phpbb\db\migration\migration
 {
+	public function effectively_installed()
+	{
+		return phpbb_version_compare($this->config['version'], '3.1.0-a1', '>=');
+	}
+
 	static public function depends_on()
 	{
 		return array(

phpBB/phpbb/db/migration/data/v310/alpha2.php

@@ -15,6 +15,11 @@ namespace phpbb\db\migration\data\v310;
 
 class alpha2 extends \phpbb\db\migration\migration
 {
+	public function effectively_installed()
+	{
+		return phpbb_version_compare($this->config['version'], '3.1.0-a2', '>=');
+	}
+
 	static public function depends_on()
 	{
 		return array(

phpBB/phpbb/db/migration/data/v310/alpha3.php

@@ -15,6 +15,11 @@ namespace phpbb\db\migration\data\v310;
 
 class alpha3 extends \phpbb\db\migration\migration
 {
+	public function effectively_installed()
+	{
+		return phpbb_version_compare($this->config['version'], '3.1.0-a3', '>=');
+	}
+
 	static public function depends_on()
 	{
 		return array(

phpBB/phpbb/db/migration/data/v310/beta1.php

@@ -15,6 +15,11 @@ namespace phpbb\db\migration\data\v310;
 
 class beta1 extends \phpbb\db\migration\migration
 {
+	public function effectively_installed()
+	{
+		return phpbb_version_compare($this->config['version'], '3.1.0-b1', '>=');
+	}
+
 	static public function depends_on()
 	{
 		return array(

phpBB/phpbb/db/migration/data/v310/beta2.php

@@ -15,6 +15,11 @@ namespace phpbb\db\migration\data\v310;
 
 class beta2 extends \phpbb\db\migration\migration
 {
+	public function effectively_installed()
+	{
+		return phpbb_version_compare($this->config['version'], '3.1.0-b2', '>=');
+	}
+
 	static public function depends_on()
 	{
 		return array(

phpBB/phpbb/db/migration/data/v310/beta3.php

@@ -15,6 +15,11 @@ namespace phpbb\db\migration\data\v310;
 
 class beta3 extends \phpbb\db\migration\migration
 {
+	public function effectively_installed()
+	{
+		return phpbb_version_compare($this->config['version'], '3.1.0-b3', '>=');
+	}
+
 	static public function depends_on()
 	{
 		return array(

phpBB/phpbb/db/migration/data/v310/beta4.php

@@ -15,6 +15,11 @@ namespace phpbb\db\migration\data\v310;
 
 class beta4 extends \phpbb\db\migration\migration
 {
+	public function effectively_installed()
+	{
+		return phpbb_version_compare($this->config['version'], '3.1.0-b4', '>=');
+	}
+
 	static public function depends_on()
 	{
 		return array(

phpBB/phpbb/db/migration/data/v310/gold.php

@@ -15,6 +15,11 @@ namespace phpbb\db\migration\data\v310;
 
 class gold extends \phpbb\db\migration\migration
 {
+	public function effectively_installed()
+	{
+		return phpbb_version_compare($this->config['version'], '3.1.0', '>=');
+	}
+
 	static public function depends_on()
 	{
 		return array(

phpBB/phpbb/db/migration/data/v310/rc1.php

@@ -15,6 +15,11 @@ namespace phpbb\db\migration\data\v310;
 
 class rc1 extends \phpbb\db\migration\migration
 {
+	public function effectively_installed()
+	{
+		return phpbb_version_compare($this->config['version'], '3.1.0-RC1', '>=');
+	}
+
 	static public function depends_on()
 	{
 		return array(

phpBB/phpbb/db/migration/data/v310/rc2.php

@@ -15,6 +15,11 @@ namespace phpbb\db\migration\data\v310;
 
 class rc2 extends \phpbb\db\migration\migration
 {
+	public function effectively_installed()
+	{
+		return phpbb_version_compare($this->config['version'], '3.1.0-RC2', '>=');
+	}
+
 	static public function depends_on()
 	{
 		return array(

phpBB/phpbb/db/migration/data/v310/rc3.php

@@ -15,6 +15,11 @@ namespace phpbb\db\migration\data\v310;
 
 class rc3 extends \phpbb\db\migration\migration
 {
+	public function effectively_installed()
+	{
+		return phpbb_version_compare($this->config['version'], '3.1.0-RC3', '>=');
+	}
+
 	static public function depends_on()
 	{
 		return array(

phpBB/phpbb/db/migration/data/v310/rc4.php

@@ -15,6 +15,11 @@ namespace phpbb\db\migration\data\v310;
 
 class rc4 extends \phpbb\db\migration\migration
 {
+	public function effectively_installed()
+	{
+		return phpbb_version_compare($this->config['version'], '3.1.0-RC4', '>=');
+	}
+
 	static public function depends_on()
 	{
 		return array(

phpBB/phpbb/db/migration/data/v310/rc5.php

@@ -15,6 +15,11 @@ namespace phpbb\db\migration\data\v310;
 
 class rc5 extends \phpbb\db\migration\migration
 {
+	public function effectively_installed()
+	{
+		return phpbb_version_compare($this->config['version'], '3.1.0-RC5', '>=');
+	}
+
 	static public function depends_on()
 	{
 		return array(

phpBB/phpbb/db/migration/data/v310/rc6.php

@@ -15,6 +15,11 @@ namespace phpbb\db\migration\data\v310;
 
 class rc6 extends \phpbb\db\migration\migration
 {
+	public function effectively_installed()
+	{
+		return phpbb_version_compare($this->config['version'], '3.1.0-RC6', '>=');
+	}
+
 	static public function depends_on()
 	{
 		return array(

phpBB/phpbb/db/migration/data/v31x/v311.php

@@ -15,6 +15,11 @@ namespace phpbb\db\migration\data\v31x;
 
 class v311 extends \phpbb\db\migration\migration
 {
+	public function effectively_installed()
+	{
+		return phpbb_version_compare($this->config['version'], '3.1.1', '>=');
+	}
+
 	static public function depends_on()
 	{
 		return array(

phpBB/phpbb/db/migration/data/v31x/v312.php

@@ -15,6 +15,11 @@ namespace phpbb\db\migration\data\v31x;
 
 class v312 extends \phpbb\db\migration\migration
 {
+	public function effectively_installed()
+	{
+		return phpbb_version_compare($this->config['version'], '3.1.2', '>=');
+	}
+
 	static public function depends_on()
 	{
 		return array(

phpBB/phpbb/db/migration/data/v31x/v312rc1.php

@@ -15,6 +15,11 @@ namespace phpbb\db\migration\data\v31x;
 
 class v312rc1 extends \phpbb\db\migration\migration
 {
+	public function effectively_installed()
+	{
+		return phpbb_version_compare($this->config['version'], '3.1.2-RC1', '>=');
+	}
+
 	static public function depends_on()
 	{
 		return array(

phpBB/phpbb/db/migration/data/v31x/v313.php

@@ -15,6 +15,11 @@ namespace phpbb\db\migration\data\v31x;
 
 class v313 extends \phpbb\db\migration\migration
 {
+	public function effectively_installed()
+	{
+		return phpbb_version_compare($this->config['version'], '3.1.3', '>=');
+	}
+
 	static public function depends_on()
 	{
 		return array(

phpBB/phpbb/db/migration/data/v31x/v313rc1.php

@@ -15,6 +15,11 @@ namespace phpbb\db\migration\data\v31x;
 
 class v313rc1 extends \phpbb\db\migration\migration
 {
+	public function effectively_installed()
+	{
+		return phpbb_version_compare($this->config['version'], '3.1.3-RC1', '>=');
+	}
+
 	static public function depends_on()
 	{
 		return array(

phpBB/phpbb/db/migration/data/v31x/v313rc2.php

@@ -15,6 +15,11 @@ namespace phpbb\db\migration\data\v31x;
 
 class v313rc2 extends \phpbb\db\migration\migration
 {
+	public function effectively_installed()
+	{
+		return phpbb_version_compare($this->config['version'], '3.1.3-RC2', '>=');
+	}
+
 	static public function depends_on()
 	{
 		return array(

phpBB/phpbb/db/migration/data/v31x/v314.php

@@ -15,6 +15,11 @@ namespace phpbb\db\migration\data\v31x;
 
 class v314 extends \phpbb\db\migration\migration
 {
+	public function effectively_installed()
+	{
+		return phpbb_version_compare($this->config['version'], '3.1.4', '>=');
+	}
+
 	static public function depends_on()
 	{
 		return array(

phpBB/phpbb/db/migration/data/v31x/v314rc1.php

@@ -15,6 +15,11 @@ namespace phpbb\db\migration\data\v31x;
 
 class v314rc1 extends \phpbb\db\migration\migration
 {
+	public function effectively_installed()
+	{
+		return phpbb_version_compare($this->config['version'], '3.1.4-RC1', '>=');
+	}
+
 	static public function depends_on()
 	{
 		return array(

phpBB/phpbb/db/migration/data/v31x/v314rc2.php

@@ -15,6 +15,11 @@ namespace phpbb\db\migration\data\v31x;
 
 class v314rc2 extends \phpbb\db\migration\migration
 {
+	public function effectively_installed()
+	{
+		return phpbb_version_compare($this->config['version'], '3.1.4-RC2', '>=');
+	}
+
 	static public function depends_on()
 	{
 		return array(

phpBB/phpbb/db/migration/data/v31x/v315.php

@@ -15,6 +15,11 @@ namespace phpbb\db\migration\data\v31x;
 
 class v315 extends \phpbb\db\migration\migration
 {
+	public function effectively_installed()
+	{
+		return phpbb_version_compare($this->config['version'], '3.1.5', '>=');
+	}
+
 	static public function depends_on()
 	{
 		return array(

phpBB/phpbb/db/migration/data/v31x/v315rc1.php

@@ -15,6 +15,11 @@ namespace phpbb\db\migration\data\v31x;
 
 class v315rc1 extends \phpbb\db\migration\migration
 {
+	public function effectively_installed()
+	{
+		return phpbb_version_compare($this->config['version'], '3.1.5-RC1', '>=');
+	}
+
 	static public function depends_on()
 	{
 		return array(

phpBB/phpbb/db/migration/data/v31x/v316.php

@@ -15,6 +15,11 @@ namespace phpbb\db\migration\data\v31x;
 
 class v316 extends \phpbb\db\migration\migration
 {
+	public function effectively_installed()
+	{
+		return phpbb_version_compare($this->config['version'], '3.1.6', '>=');
+	}
+
 	static public function depends_on()
 	{
 		return array(

phpBB/phpbb/db/migration/data/v31x/v316rc1.php

@@ -15,6 +15,11 @@ namespace phpbb\db\migration\data\v31x;
 
 class v316rc1 extends \phpbb\db\migration\migration
 {
+	public function effectively_installed()
+	{
+		return phpbb_version_compare($this->config['version'], '3.1.6-RC1', '>=');
+	}
+
 	static public function depends_on()
 	{
 		return array(

phpBB/phpbb/db/migration/data/v31x/v317.php

@@ -15,6 +15,11 @@ namespace phpbb\db\migration\data\v31x;
 
 class v317 extends \phpbb\db\migration\migration
 {
+	public function effectively_installed()
+	{
+		return phpbb_version_compare($this->config['version'], '3.1.7', '>=');
+	}
+
 	static public function depends_on()
 	{
 		return array(

phpBB/phpbb/db/migration/data/v31x/v317pl1.php

@@ -15,6 +15,11 @@ namespace phpbb\db\migration\data\v31x;
 
 class v317pl1 extends \phpbb\db\migration\migration
 {
+	public function effectively_installed()
+	{
+		return phpbb_version_compare($this->config['version'], '3.1.7-pl1', '>=');
+	}
+
 	static public function depends_on()
 	{
 		return array(

phpBB/phpbb/db/migration/data/v31x/v317rc1.php

@@ -15,6 +15,11 @@ namespace phpbb\db\migration\data\v31x;
 
 class v317rc1 extends \phpbb\db\migration\migration
 {
+	public function effectively_installed()
+	{
+		return phpbb_version_compare($this->config['version'], '3.1.7-RC1', '>=');
+	}
+
 	static public function depends_on()
 	{
 		return array(

phpBB/phpbb/db/migration/data/v31x/v318.php

@@ -15,6 +15,11 @@ namespace phpbb\db\migration\data\v31x;
 
 class v318 extends \phpbb\db\migration\migration
 {
+	public function effectively_installed()
+	{
+		return phpbb_version_compare($this->config['version'], '3.1.8', '>=');
+	}
+
 	static public function depends_on()
 	{
 		return array(

phpBB/phpbb/db/migration/data/v31x/v318rc1.php

@@ -15,6 +15,11 @@ namespace phpbb\db\migration\data\v31x;
 
 class v318rc1 extends \phpbb\db\migration\migration
 {
+	public function effectively_installed()
+	{
+		return phpbb_version_compare($this->config['version'], '3.1.8-RC1', '>=');
+	}
+
 	static public function depends_on()
 	{
 		return array(