From 73741e547b6a45c225cdc77cf56580c2e2730b70 Mon Sep 17 00:00:00 2001
From: 3D-I <480857+3D-I@users.noreply.github.com>
Date: Sat, 16 May 2020 14:38:12 +0200
Subject: [PATCH 1/4] [ticket/16487] Fix URL for fontawesome 3.2.0 migration

PHPBB3-16487
---
 .../data/v320/font_awesome_update.php         | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/phpBB/phpbb/db/migration/data/v320/font_awesome_update.php b/phpBB/phpbb/db/migration/data/v320/font_awesome_update.php
index 817b638037..f13b94a31e 100644
--- a/phpBB/phpbb/db/migration/data/v320/font_awesome_update.php
+++ b/phpBB/phpbb/db/migration/data/v320/font_awesome_update.php
@@ -15,22 +15,22 @@ namespace phpbb\db\migration\data\v320;
 
 class font_awesome_update extends \phpbb\db\migration\migration
 {
-	static public function depends_on()
-	{
-		return array(
-			'\phpbb\db\migration\data\v320\dev',
-		);
-	}
-
 	public function effectively_installed()
 	{
 		return isset($this->config['load_font_awesome_url']);
 	}
 
+	static public function depends_on()
+	{
+		return [
+			'\phpbb\db\migration\data\v320\dev',
+		];
+	}
+
 	public function update_data()
 	{
-		return array(
-			array('config.add', array('load_font_awesome_url', 'https://maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css')),
-		);
+		return [
+			['config.add', ['load_font_awesome_url', 'https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css']],
+		];
 	}
 }

From 2dd571bc5dafb4623fe5eb0250817bee1eb5c3a3 Mon Sep 17 00:00:00 2001
From: 3D-I <480857+3D-I@users.noreply.github.com>
Date: Sat, 16 May 2020 15:04:33 +0200
Subject: [PATCH 2/4] [ticket/16487] Fix URL for fontawesome 3.2.0 migration

revert to 4.4.0 version

PHPBB3-16487
---
 phpBB/phpbb/db/migration/data/v320/font_awesome_update.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/phpbb/db/migration/data/v320/font_awesome_update.php b/phpBB/phpbb/db/migration/data/v320/font_awesome_update.php
index f13b94a31e..9c584809dd 100644
--- a/phpBB/phpbb/db/migration/data/v320/font_awesome_update.php
+++ b/phpBB/phpbb/db/migration/data/v320/font_awesome_update.php
@@ -30,7 +30,7 @@ class font_awesome_update extends \phpbb\db\migration\migration
 	public function update_data()
 	{
 		return [
-			['config.add', ['load_font_awesome_url', 'https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css']],
+			['config.add', ['load_font_awesome_url', 'https://maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css']],
 		];
 	}
 }

From d69049d6be367877bda20175dc89bfd91f2677b3 Mon Sep 17 00:00:00 2001
From: 3D-I <480857+3D-I@users.noreply.github.com>
Date: Sat, 16 May 2020 15:12:44 +0200
Subject: [PATCH 3/4] [ticket/16487] Fix URL for fontawesome 3.2.0 migration

PHPBB3-16487
---
 .../data/v32x/font_awesome_update_cdn.php     | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 phpBB/phpbb/db/migration/data/v32x/font_awesome_update_cdn.php

diff --git a/phpBB/phpbb/db/migration/data/v32x/font_awesome_update_cdn.php b/phpBB/phpbb/db/migration/data/v32x/font_awesome_update_cdn.php
new file mode 100644
index 0000000000..02e78c7505
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v32x/font_awesome_update_cdn.php
@@ -0,0 +1,31 @@
+<?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\v32x;
+
+class font_awesome_update_cdn extends \phpbb\db\migration\migration
+{
+	static public function depends_on()
+	{
+		return [
+			'\phpbb\db\migration\data\v32x\v329',
+		];
+	}
+
+	public function update_data()
+	{
+		return [
+			['config.update', ['load_font_awesome_url', 'https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css']],
+		];
+	}
+}

From bb32ec38da92bd1f4f8777f7edd0b8ba6da7ad60 Mon Sep 17 00:00:00 2001
From: 3D-I <480857+3D-I@users.noreply.github.com>
Date: Tue, 26 May 2020 21:53:33 +0200
Subject: [PATCH 4/4] [ticket/16487] Fix URL for fontawesome 3.2.0 migration

PHPBB3-16487
---
 .../phpbb/db/migration/data/v32x/font_awesome_update_cdn.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/phpBB/phpbb/db/migration/data/v32x/font_awesome_update_cdn.php b/phpBB/phpbb/db/migration/data/v32x/font_awesome_update_cdn.php
index 02e78c7505..bb477b8437 100644
--- a/phpBB/phpbb/db/migration/data/v32x/font_awesome_update_cdn.php
+++ b/phpBB/phpbb/db/migration/data/v32x/font_awesome_update_cdn.php
@@ -15,6 +15,11 @@ namespace phpbb\db\migration\data\v32x;
 
 class font_awesome_update_cdn extends \phpbb\db\migration\migration
 {
+	public function effectively_installed()
+	{
+		return phpbb_version_compare($this->config['version'], '3.3.0', '>=');
+	}
+
 	static public function depends_on()
 	{
 		return [