From f0d910a1821c7d76f973a0bfdef40fe6d8275ebb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotrek=20Reinmar=20Koszuli=C5=84ski?=
 <pkoszulinski@gmail.com>
Date: Tue, 29 Jul 2014 17:40:34 +0200
Subject: [PATCH 1/8] Made ckeditor.js's src regexp testable and added support
 for URL params separation by semicolon.

---
 ckeditor.js                                   |  5 +-
 core/ckeditor_base.js                         |  9 +--
 core/loader.js                                |  2 +-
 .../{basepath.html => basepathglobal.html}    |  0
 .../{basepath.js => basepathglobal.js}        |  0
 tests/core/ckeditor/basepathproperty.html     |  2 +
 tests/core/ckeditor/basepathproperty.js       | 67 +++++++++++++++++++
 7 files changed, 79 insertions(+), 6 deletions(-)
 rename tests/core/ckeditor/{basepath.html => basepathglobal.html} (100%)
 rename tests/core/ckeditor/{basepath.js => basepathglobal.js} (100%)
 create mode 100644 tests/core/ckeditor/basepathproperty.html
 create mode 100644 tests/core/ckeditor/basepathproperty.js

diff --git a/ckeditor.js b/ckeditor.js
index abb087d1565..3d28515e92c 100644
--- a/ckeditor.js
+++ b/ckeditor.js
@@ -5,7 +5,10 @@
 
 // Compressed version of core/ckeditor_base.js. See original for instructions.
 /*jsl:ignore*/
-window.CKEDITOR||(window.CKEDITOR=function(){var b={timestamp:"",version:"%VERSION%",revision:"%REV%",rnd:Math.floor(900*Math.random())+100,_:{pending:[]},status:"unloaded",basePath:function(){var a=window.CKEDITOR_BASEPATH||"";if(!a)for(var b=document.getElementsByTagName("script"),c=0;c<b.length;c++){var d=b[c].src.match(/(^|.*[\\\/])ckeditor(?:_basic)?(?:_source)?.js(?:\?.*)?$/i);if(d){a=d[1];break}}-1==a.indexOf(":/")&&"//"!=a.slice(0,2)&&(a=0===a.indexOf("/")?location.href.match(/^.*?:\/\/[^\/]*/)[0]+a:location.href.match(/^[^\?]*\/(?:)/)[0]+a);if(!a)throw'The CKEditor installation path could not be automatically detected. Please set the global variable "CKEDITOR_BASEPATH" before creating editor instances.';return a}(),getUrl:function(a){-1==a.indexOf(":/")&&0!==a.indexOf("/")&&(a=this.basePath+a);this.timestamp&&"/"!=a.charAt(a.length-1)&&!/[&?]t=/.test(a)&&(a+=(0<=a.indexOf("?")?"&":"?")+"t="+this.timestamp);return a},domReady:function(){function a(){try{document.addEventListener?(document.removeEventListener("DOMContentLoaded",a,!1),b()):document.attachEvent&&"complete"===document.readyState&&(document.detachEvent("onreadystatechange",a),b())}catch(d){}}function b(){for(var a;a=c.shift();)a()}var c=[];return function(b){c.push(b);"complete"===document.readyState&&setTimeout(a,1);if(1==c.length)if(document.addEventListener)document.addEventListener("DOMContentLoaded",a,!1),window.addEventListener("load",a,!1);else if(document.attachEvent){document.attachEvent("onreadystatechange",a);window.attachEvent("onload",a);b=!1;try{b=!window.frameElement}catch(e){}if(document.documentElement.doScroll&&b){var f=function(){try{document.documentElement.doScroll("left")}catch(b){setTimeout(f,1);return}a()};f()}}}}()},e=window.CKEDITOR_GETURL;if(e){var g=b.getUrl;b.getUrl=function(a){return e.call(b,a)||g.call(b,a)}}return b}());
+window.CKEDITOR||(window.CKEDITOR=function(){var e=/(^|.*[\\\/])ckeditor(?:_basic)?(?:_source)?.js(?:\?.*|;.*)?$/i,b={timestamp:"",version:"%VERSION%",revision:"%REV%",rnd:Math.floor(900*Math.random())+100,_:{pending:[],basePathSrcPattern:e},status:"unloaded",basePath:function(){var a=window.CKEDITOR_BASEPATH||"";if(!a)for(var b=document.getElementsByTagName("script"),c=0;c<b.length;c++){var f=b[c].src.match(e);if(f){a=f[1];break}}-1==a.indexOf(":/")&&"//"!=a.slice(0,2)&&(a=0===a.indexOf("/")?location.href.match(/^.*?:\/\/[^\/]*/)[0]+
+a:location.href.match(/^[^\?]*\/(?:)/)[0]+a);if(!a)throw'The CKEditor installation path could not be automatically detected. Please set the global variable "CKEDITOR_BASEPATH" before creating editor instances.';return a}(),getUrl:function(a){-1==a.indexOf(":/")&&0!==a.indexOf("/")&&(a=this.basePath+a);this.timestamp&&"/"!=a.charAt(a.length-1)&&!/[&?]t=/.test(a)&&(a+=(0<=a.indexOf("?")?"&":"?")+"t="+this.timestamp);return a},domReady:function(){function a(){try{document.addEventListener?(document.removeEventListener("DOMContentLoaded",
+a,!1),b()):document.attachEvent&&"complete"===document.readyState&&(document.detachEvent("onreadystatechange",a),b())}catch(f){}}function b(){for(var a;a=c.shift();)a()}var c=[];return function(b){c.push(b);"complete"===document.readyState&&setTimeout(a,1);if(1==c.length)if(document.addEventListener)document.addEventListener("DOMContentLoaded",a,!1),window.addEventListener("load",a,!1);else if(document.attachEvent){document.attachEvent("onreadystatechange",a);window.attachEvent("onload",a);b=!1;try{b=
+!window.frameElement}catch(e){}if(document.documentElement.doScroll&&b){var d=function(){try{document.documentElement.doScroll("left")}catch(b){setTimeout(d,1);return}a()};d()}}}}()},d=window.CKEDITOR_GETURL;if(d){var g=b.getUrl;b.getUrl=function(a){return d.call(b,a)||g.call(b,a)}}return b}());
 /*jsl:end*/
 
 if ( CKEDITOR.loader )
diff --git a/core/ckeditor_base.js b/core/ckeditor_base.js
index 069793172a9..b58c910a6fd 100644
--- a/core/ckeditor_base.js
+++ b/core/ckeditor_base.js
@@ -10,8 +10,6 @@
 
 // #### Compressed Code
 // Must be updated on changes in the script as well as updated in the ckeditor.js file.
-
-// window.CKEDITOR||(window.CKEDITOR=function(){var b={timestamp:"",version:"%VERSION%",revision:"%REV%",rnd:Math.floor(900*Math.random())+100,_:{pending:[]},status:"unloaded",basePath:function(){var a=window.CKEDITOR_BASEPATH||"";if(!a)for(var b=document.getElementsByTagName("script"),c=0;c<b.length;c++){var d=b[c].src.match(/(^|.*[\\\/])ckeditor(?:_basic)?(?:_source)?.js(?:\?.*)?$/i);if(d){a=d[1];break}}-1==a.indexOf(":/")&&"//"!=a.slice(0,2)&&(a=0===a.indexOf("/")?location.href.match(/^.*?:\/\/[^\/]*/)[0]+a:location.href.match(/^[^\?]*\/(?:)/)[0]+a);if(!a)throw'The CKEditor installation path could not be automatically detected. Please set the global variable "CKEDITOR_BASEPATH" before creating editor instances.';return a}(),getUrl:function(a){-1==a.indexOf(":/")&&0!==a.indexOf("/")&&(a=this.basePath+a);this.timestamp&&"/"!=a.charAt(a.length-1)&&!/[&?]t=/.test(a)&&(a+=(0<=a.indexOf("?")?"&":"?")+"t="+this.timestamp);return a},domReady:function(){function a(){try{document.addEventListener?(document.removeEventListener("DOMContentLoaded",a,!1),b()):document.attachEvent&&"complete"===document.readyState&&(document.detachEvent("onreadystatechange",a),b())}catch(d){}}function b(){for(var a;a=c.shift();)a()}var c=[];return function(b){c.push(b);"complete"===document.readyState&&setTimeout(a,1);if(1==c.length)if(document.addEventListener)document.addEventListener("DOMContentLoaded",a,!1),window.addEventListener("load",a,!1);else if(document.attachEvent){document.attachEvent("onreadystatechange",a);window.attachEvent("onload",a);b=!1;try{b=!window.frameElement}catch(e){}if(document.documentElement.doScroll&&b){var f=function(){try{document.documentElement.doScroll("left")}catch(b){setTimeout(f,1);return}a()};f()}}}}()},e=window.CKEDITOR_GETURL;if(e){var g=b.getUrl;b.getUrl=function(a){return e.call(b,a)||g.call(b,a)}}return b}());
 // The Closure Compiler online service should be used when updating this manually:
 // http://closure-compiler.appspot.com/
 
@@ -25,6 +23,8 @@ if ( !window.CKEDITOR ) {
 	 * @singleton
 	 */
 	window.CKEDITOR = ( function() {
+		var basePathSrcPattern = /(^|.*[\\\/])ckeditor(?:_basic)?(?:_source)?.js(?:\?.*|;.*)?$/i;
+
 		var CKEDITOR = {
 
 			/**
@@ -76,7 +76,8 @@ if ( !window.CKEDITOR ) {
 			 * @private
 			 */
 			_: {
-				pending: []
+				pending: [],
+				basePathSrcPattern: basePathSrcPattern
 			},
 
 			/**
@@ -121,7 +122,7 @@ if ( !window.CKEDITOR ) {
 					var scripts = document.getElementsByTagName( 'script' );
 
 					for ( var i = 0; i < scripts.length; i++ ) {
-						var match = scripts[ i ].src.match( /(^|.*[\\\/])ckeditor(?:_basic)?(?:_source)?.js(?:\?.*)?$/i );
+						var match = scripts[ i ].src.match( basePathSrcPattern );
 
 						if ( match ) {
 							path = match[ 1 ];
diff --git a/core/loader.js b/core/loader.js
index 12207876833..b32e27f3750 100644
--- a/core/loader.js
+++ b/core/loader.js
@@ -87,7 +87,7 @@ if ( !CKEDITOR.loader ) {
 			var scripts = document.getElementsByTagName( 'script' );
 
 			for ( var i = 0; i < scripts.length; i++ ) {
-				var match = scripts[ i ].src.match( /(^|.*?[\\\/])(?:_source\/)?core\/loader.js(?:\?.*)?$/i );
+				var match = scripts[ i ].src.match( /(^|.*?[\\\/])(?:_source\/)?core\/loader.js(?:\?.*|;.*)?$/i );
 
 				if ( match ) {
 					path = match[ 1 ];
diff --git a/tests/core/ckeditor/basepath.html b/tests/core/ckeditor/basepathglobal.html
similarity index 100%
rename from tests/core/ckeditor/basepath.html
rename to tests/core/ckeditor/basepathglobal.html
diff --git a/tests/core/ckeditor/basepath.js b/tests/core/ckeditor/basepathglobal.js
similarity index 100%
rename from tests/core/ckeditor/basepath.js
rename to tests/core/ckeditor/basepathglobal.js
diff --git a/tests/core/ckeditor/basepathproperty.html b/tests/core/ckeditor/basepathproperty.html
new file mode 100644
index 00000000000..5715b7a51c9
--- /dev/null
+++ b/tests/core/ckeditor/basepathproperty.html
@@ -0,0 +1,2 @@
+<iframe id="iframe-default-params"></iframe>
+<iframe id="iframe-semicolon-params"></iframe>
\ No newline at end of file
diff --git a/tests/core/ckeditor/basepathproperty.js b/tests/core/ckeditor/basepathproperty.js
new file mode 100644
index 00000000000..4d7d8cf82e7
--- /dev/null
+++ b/tests/core/ckeditor/basepathproperty.js
@@ -0,0 +1,67 @@
+/* bender-tags: editor,unit */
+
+( function() {
+	'use strict';
+
+	bender.test( {
+		'test CKEDITOR.basePath when used src="ckeditor.js?foo&bar"': function() {
+			var iframe = CKEDITOR.document.getById( 'iframe-default-params' ),
+				doc = iframe.getFrameDocument(),
+				defaultPath = CKEDITOR.basePath;
+
+			iframe.on( 'load', function() {
+				resume( function() {
+					var iCKEDITOR = iframe.$.contentWindow.CKEDITOR;
+
+					assert.areSame( CKEDITOR.basePath, CKEDITOR.basePath );
+				} );
+			} );
+
+			doc.$.open();
+			doc.$.write( '<script src="' + CKEDITOR.getUrl( 'ckeditor.js' ) + '?foo=1&bar=2"></scr' + 'ipt>' );
+			doc.$.close();
+
+			wait();
+		},
+
+		'test CKEDITOR.basePath ckeditor.js src pattern': function() {
+			var pattern = CKEDITOR._.basePathSrcPattern;
+
+			a( 'ckeditor.js' );
+			a( '/ckeditor.js' );
+			a( '\\ckeditor.js' );
+			a( '/ckeditor.js?foo=1#bar' );
+			a( 'CKEDITOR.JS' );
+			// #12215
+			a( '/ckeditor.js;id=foo-bar' );
+
+			function a( src ) {
+				assert.isMatching( pattern, src, src );
+			}
+		},
+
+		/*
+		#12215
+		Test impossible to perform with present Bender's capabilities.
+		'test CKEDITOR.basePath when used src="ckeditor.js;foo&bar"': function() {
+			var iframe = CKEDITOR.document.getById( 'iframe-semicolon-params' ),
+				doc = iframe.getFrameDocument(),
+				defaultPath = CKEDITOR.basePath;
+
+			iframe.on( 'load', function() {
+				resume( function() {
+					var iCKEDITOR = iframe.$.contentWindow.CKEDITOR;
+
+					assert.areSame( CKEDITOR.basePath, CKEDITOR.basePath );
+				} );
+			} );
+
+			doc.$.open();
+			doc.$.write( '<script src="' + CKEDITOR.getUrl( 'ckeditor.js' ) + ';foo=1&bar=2"></scr' + 'ipt>' );
+			doc.$.close();
+
+			wait();
+		}
+		*/
+	} );
+} )();
\ No newline at end of file

From bf96e2080a42400432f8485b20c4df817d846150 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotrek=20Reinmar=20Koszuli=C5=84ski?=
 <pkoszulinski@gmail.com>
Date: Tue, 29 Jul 2014 17:42:15 +0200
Subject: [PATCH 2/8] Loader is never used without ckeditor.js which sets
 basePath.

---
 core/loader.js | 35 +----------------------------------
 1 file changed, 1 insertion(+), 34 deletions(-)

diff --git a/core/loader.js b/core/loader.js
index b32e27f3750..b17e8962d61 100644
--- a/core/loader.js
+++ b/core/loader.js
@@ -76,39 +76,6 @@ if ( !CKEDITOR.loader ) {
 			'creators/inline': []
 		};
 
-		var basePath = ( function() {
-			// This is a copy of CKEDITOR.basePath, but requires the script having
-			// "_source/loader.js".
-			if ( CKEDITOR && CKEDITOR.basePath )
-				return CKEDITOR.basePath;
-
-			// Find out the editor directory path, based on its <script> tag.
-			var path = '';
-			var scripts = document.getElementsByTagName( 'script' );
-
-			for ( var i = 0; i < scripts.length; i++ ) {
-				var match = scripts[ i ].src.match( /(^|.*?[\\\/])(?:_source\/)?core\/loader.js(?:\?.*|;.*)?$/i );
-
-				if ( match ) {
-					path = match[ 1 ];
-					break;
-				}
-			}
-
-			// In IE (only) the script.src string is the raw valued entered in the
-			// HTML. Other browsers return the full resolved URL instead.
-			if ( path.indexOf( '://' ) == -1 ) {
-				// Absolute path.
-				if ( path.indexOf( '/' ) === 0 )
-					path = location.href.match( /^.*?:\/\/[^\/]*/ )[ 0 ] + path;
-				// Relative path.
-				else
-					path = location.href.match( /^[^\?]*\// )[ 0 ] + path;
-			}
-
-			return path;
-		} )();
-
 		var timestamp = ( CKEDITOR && CKEDITOR.timestamp ) || ( new Date() ).valueOf(); // %REMOVE_LINE%
 		/*																				// %REMOVE_LINE%
 		 * The production implementation contains a fixed timestamp						// %REMOVE_LINE%
@@ -120,7 +87,7 @@ if ( !CKEDITOR.loader ) {
 				if ( CKEDITOR && CKEDITOR.getUrl )
 					return CKEDITOR.getUrl( resource );
 
-				return basePath + resource + ( resource.indexOf( '?' ) >= 0 ? '&' : '?' ) + 't=' + timestamp;
+				return CKEDITOR.basePath + resource + ( resource.indexOf( '?' ) >= 0 ? '&' : '?' ) + 't=' + timestamp;
 			};
 
 		var pendingLoad = [];

From b479410e35776cfeaa336963e68bbfc9f1398e8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotrek=20Reinmar=20Koszuli=C5=84ski?=
 <pkoszulinski@gmail.com>
Date: Tue, 29 Jul 2014 17:56:13 +0200
Subject: [PATCH 3/8] Loading ckeditor_basic.js is not supported any more and
 ckeditor_source.js does not exist any more.

---
 ckeditor.js           | 2 +-
 core/ckeditor_base.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ckeditor.js b/ckeditor.js
index 3d28515e92c..76eb14f169b 100644
--- a/ckeditor.js
+++ b/ckeditor.js
@@ -5,7 +5,7 @@
 
 // Compressed version of core/ckeditor_base.js. See original for instructions.
 /*jsl:ignore*/
-window.CKEDITOR||(window.CKEDITOR=function(){var e=/(^|.*[\\\/])ckeditor(?:_basic)?(?:_source)?.js(?:\?.*|;.*)?$/i,b={timestamp:"",version:"%VERSION%",revision:"%REV%",rnd:Math.floor(900*Math.random())+100,_:{pending:[],basePathSrcPattern:e},status:"unloaded",basePath:function(){var a=window.CKEDITOR_BASEPATH||"";if(!a)for(var b=document.getElementsByTagName("script"),c=0;c<b.length;c++){var f=b[c].src.match(e);if(f){a=f[1];break}}-1==a.indexOf(":/")&&"//"!=a.slice(0,2)&&(a=0===a.indexOf("/")?location.href.match(/^.*?:\/\/[^\/]*/)[0]+
+window.CKEDITOR||(window.CKEDITOR=function(){var e=/(^|.*[\\\/])ckeditor\.js(?:\?.*|;.*)?$/i,b={timestamp:"",version:"%VERSION%",revision:"%REV%",rnd:Math.floor(900*Math.random())+100,_:{pending:[],basePathSrcPattern:e},status:"unloaded",basePath:function(){var a=window.CKEDITOR_BASEPATH||"";if(!a)for(var b=document.getElementsByTagName("script"),c=0;c<b.length;c++){var f=b[c].src.match(e);if(f){a=f[1];break}}-1==a.indexOf(":/")&&"//"!=a.slice(0,2)&&(a=0===a.indexOf("/")?location.href.match(/^.*?:\/\/[^\/]*/)[0]+
 a:location.href.match(/^[^\?]*\/(?:)/)[0]+a);if(!a)throw'The CKEditor installation path could not be automatically detected. Please set the global variable "CKEDITOR_BASEPATH" before creating editor instances.';return a}(),getUrl:function(a){-1==a.indexOf(":/")&&0!==a.indexOf("/")&&(a=this.basePath+a);this.timestamp&&"/"!=a.charAt(a.length-1)&&!/[&?]t=/.test(a)&&(a+=(0<=a.indexOf("?")?"&":"?")+"t="+this.timestamp);return a},domReady:function(){function a(){try{document.addEventListener?(document.removeEventListener("DOMContentLoaded",
 a,!1),b()):document.attachEvent&&"complete"===document.readyState&&(document.detachEvent("onreadystatechange",a),b())}catch(f){}}function b(){for(var a;a=c.shift();)a()}var c=[];return function(b){c.push(b);"complete"===document.readyState&&setTimeout(a,1);if(1==c.length)if(document.addEventListener)document.addEventListener("DOMContentLoaded",a,!1),window.addEventListener("load",a,!1);else if(document.attachEvent){document.attachEvent("onreadystatechange",a);window.attachEvent("onload",a);b=!1;try{b=
 !window.frameElement}catch(e){}if(document.documentElement.doScroll&&b){var d=function(){try{document.documentElement.doScroll("left")}catch(b){setTimeout(d,1);return}a()};d()}}}}()},d=window.CKEDITOR_GETURL;if(d){var g=b.getUrl;b.getUrl=function(a){return d.call(b,a)||g.call(b,a)}}return b}());
diff --git a/core/ckeditor_base.js b/core/ckeditor_base.js
index b58c910a6fd..0003e363936 100644
--- a/core/ckeditor_base.js
+++ b/core/ckeditor_base.js
@@ -23,7 +23,7 @@ if ( !window.CKEDITOR ) {
 	 * @singleton
 	 */
 	window.CKEDITOR = ( function() {
-		var basePathSrcPattern = /(^|.*[\\\/])ckeditor(?:_basic)?(?:_source)?.js(?:\?.*|;.*)?$/i;
+		var basePathSrcPattern = /(^|.*[\\\/])ckeditor\.js(?:\?.*|;.*)?$/i;
 
 		var CKEDITOR = {
 

From fd5ba9901a8f2dae5866494b3981aa415cf87a02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotrek=20Reinmar=20Koszuli=C5=84ski?=
 <pkoszulinski@gmail.com>
Date: Wed, 13 Aug 2014 14:15:26 +0200
Subject: [PATCH 4/8] Removed outdated comment.

---
 core/ckeditor_base.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/core/ckeditor_base.js b/core/ckeditor_base.js
index 0003e363936..3de075560fd 100644
--- a/core/ckeditor_base.js
+++ b/core/ckeditor_base.js
@@ -112,9 +112,6 @@ if ( !window.CKEDITOR ) {
 			 * @property {String}
 			 */
 			basePath: ( function() {
-				// ATTENTION: fixes to this code must be ported to
-				// var basePath in "core/loader.js".
-
 				// Find out the editor directory path, based on its <script> tag.
 				var path = window.CKEDITOR_BASEPATH || '';
 

From 5d2689f38ca97f12f28c76cf6f7f48c305a5f0c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotrek=20Reinmar=20Koszuli=C5=84ski?=
 <pkoszulinski@gmail.com>
Date: Wed, 13 Aug 2014 14:19:14 +0200
Subject: [PATCH 5/8] Tests: Fixed assertions.

---
 tests/core/ckeditor/basepathproperty.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/core/ckeditor/basepathproperty.js b/tests/core/ckeditor/basepathproperty.js
index 4d7d8cf82e7..ccf929b5324 100644
--- a/tests/core/ckeditor/basepathproperty.js
+++ b/tests/core/ckeditor/basepathproperty.js
@@ -13,7 +13,7 @@
 				resume( function() {
 					var iCKEDITOR = iframe.$.contentWindow.CKEDITOR;
 
-					assert.areSame( CKEDITOR.basePath, CKEDITOR.basePath );
+					assert.areSame( CKEDITOR.basePath, iCKEDITOR.basePath );
 				} );
 			} );
 
@@ -52,7 +52,7 @@
 				resume( function() {
 					var iCKEDITOR = iframe.$.contentWindow.CKEDITOR;
 
-					assert.areSame( CKEDITOR.basePath, CKEDITOR.basePath );
+					assert.areSame( CKEDITOR.basePath, iCKEDITOR.basePath );
 				} );
 			} );
 

From 64de5370f1b843e3a2901e7104ea435ee61ba6ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotrek=20Reinmar=20Koszuli=C5=84ski?=
 <pkoszulinski@gmail.com>
Date: Wed, 13 Aug 2014 14:20:19 +0200
Subject: [PATCH 6/8] Tests: Cleaned up leftovers.

---
 tests/core/ckeditor/basepathproperty.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/tests/core/ckeditor/basepathproperty.js b/tests/core/ckeditor/basepathproperty.js
index ccf929b5324..a4c5af02d8f 100644
--- a/tests/core/ckeditor/basepathproperty.js
+++ b/tests/core/ckeditor/basepathproperty.js
@@ -6,8 +6,7 @@
 	bender.test( {
 		'test CKEDITOR.basePath when used src="ckeditor.js?foo&bar"': function() {
 			var iframe = CKEDITOR.document.getById( 'iframe-default-params' ),
-				doc = iframe.getFrameDocument(),
-				defaultPath = CKEDITOR.basePath;
+				doc = iframe.getFrameDocument();
 
 			iframe.on( 'load', function() {
 				resume( function() {
@@ -45,8 +44,7 @@
 		Test impossible to perform with present Bender's capabilities.
 		'test CKEDITOR.basePath when used src="ckeditor.js;foo&bar"': function() {
 			var iframe = CKEDITOR.document.getById( 'iframe-semicolon-params' ),
-				doc = iframe.getFrameDocument(),
-				defaultPath = CKEDITOR.basePath;
+				doc = iframe.getFrameDocument();
 
 			iframe.on( 'load', function() {
 				resume( function() {

From 826e1c5cb80281e11057d90863b279697e7ea678 Mon Sep 17 00:00:00 2001
From: Marek Lewandowski <m.lewandowski@cksource.com>
Date: Wed, 13 Aug 2014 14:47:23 +0200
Subject: [PATCH 7/8] Updated the docs related to minified code.

---
 core/ckeditor_base.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/ckeditor_base.js b/core/ckeditor_base.js
index 3de075560fd..0f585f016af 100644
--- a/core/ckeditor_base.js
+++ b/core/ckeditor_base.js
@@ -9,7 +9,7 @@
  */
 
 // #### Compressed Code
-// Must be updated on changes in the script as well as updated in the ckeditor.js file.
+// Compressed code in ckeditor.js must be be updated on changes in the script.
 // The Closure Compiler online service should be used when updating this manually:
 // http://closure-compiler.appspot.com/
 
@@ -310,4 +310,4 @@ if ( !window.CKEDITOR ) {
  * for details.
  */
 
-// PACKAGER_RENAME( CKEDITOR )
+// PACKAGER_RENAME( CKEDITOR )
\ No newline at end of file

From 46ae250ebfb42b500abc4596128595fdade532e8 Mon Sep 17 00:00:00 2001
From: Marek Lewandowski <m.lewandowski@cksource.com>
Date: Wed, 13 Aug 2014 14:51:11 +0200
Subject: [PATCH 8/8] Changelog entry.

---
 CHANGES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES.md b/CHANGES.md
index 98b76d672f1..0046b19832f 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -20,6 +20,7 @@ Fixed Issues:
 * [#12281](http://dev.ckeditor.com/ticket/12281): Fixed: Minor syntax issue in CSS files.
 * [#12178](http://dev.ckeditor.com/ticket/12178): [Blink/Webkit] Fixed: Iterator does not return block if selection is located at the end of it.
 * [#12185](http://dev.ckeditor.com/ticket/12185): [IE9QM] Fixed: Error thrown when moving mouse over focused editor's scrollbar.
+* [#12215](http://dev.ckeditor.com/ticket/12215): Fixed: Basepath resolution doesn't recognize semicolon as a query separator.
 
 Other Changes: