From 94b49d8a925e4bc7f10cbcf117ba81b071019b73 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sun, 14 Jul 2013 20:44:00 +0200
Subject: [ticket/11703] Make jQuery CDN switch more generic.

Config variable: load_jquery_cdn -> allow_cdn
Template variable: S_JQUERY_FALLBACK -> S_ALLOW_CDN

PHPBB3-11703
---
 phpBB/phpbb/db/migration/data/v310/allow_cdn.php | 28 ++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 phpBB/phpbb/db/migration/data/v310/allow_cdn.php

(limited to 'phpBB/phpbb/db/migration')

diff --git a/phpBB/phpbb/db/migration/data/v310/allow_cdn.php b/phpBB/phpbb/db/migration/data/v310/allow_cdn.php
new file mode 100644
index 0000000000..2570998643
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v310/allow_cdn.php
@@ -0,0 +1,28 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+namespace phpbb\db\migration\data\v310;
+
+class allow_cdn extends phpbb_db_migration
+{
+	static public function depends_on()
+	{
+		return array(
+			'\phpbb\db\migration\data\v310\jquery_update',
+		);
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.add', array('allow_cdn', (int) $this->config['load_jquery_cdn'])),
+			array('config.remove', array('load_jquery_cdn')),
+		);
+	}
+}
-- 
cgit v1.2.1


From 21eae92c27d22a96f847c01770b18f3d00b5aabd Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sun, 14 Jul 2013 21:11:14 +0200
Subject: [ticket/11703] Add effectively_installed().

PHPBB3-11703
---
 phpBB/phpbb/db/migration/data/v310/allow_cdn.php | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'phpBB/phpbb/db/migration')

diff --git a/phpBB/phpbb/db/migration/data/v310/allow_cdn.php b/phpBB/phpbb/db/migration/data/v310/allow_cdn.php
index 2570998643..0b79ac77f9 100644
--- a/phpBB/phpbb/db/migration/data/v310/allow_cdn.php
+++ b/phpBB/phpbb/db/migration/data/v310/allow_cdn.php
@@ -11,6 +11,11 @@ namespace phpbb\db\migration\data\v310;
 
 class allow_cdn extends phpbb_db_migration
 {
+	public function effectively_installed()
+	{
+		return isset($this->config['allow_cdn']);
+	}
+
 	static public function depends_on()
 	{
 		return array(
-- 
cgit v1.2.1


From 51cc7155041c95ca47147072c1c04449ad0bcf67 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Thu, 10 Oct 2013 23:45:22 +0200
Subject: [ticket/11703] Extend the correct migration class.

PHPBB3-11703
---
 phpBB/phpbb/db/migration/data/v310/allow_cdn.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/phpbb/db/migration')

diff --git a/phpBB/phpbb/db/migration/data/v310/allow_cdn.php b/phpBB/phpbb/db/migration/data/v310/allow_cdn.php
index 0b79ac77f9..aa471df6e7 100644
--- a/phpBB/phpbb/db/migration/data/v310/allow_cdn.php
+++ b/phpBB/phpbb/db/migration/data/v310/allow_cdn.php
@@ -9,7 +9,7 @@
 
 namespace phpbb\db\migration\data\v310;
 
-class allow_cdn extends phpbb_db_migration
+class allow_cdn extends \phpbb\db\migration\migration
 {
 	public function effectively_installed()
 	{
-- 
cgit v1.2.1