Index: branches/5.3.x/core/ckeditor/plugins/my_document/dialogs/document.js
===================================================================
diff -u -r15483 -r16534
--- branches/5.3.x/core/ckeditor/plugins/my_document/dialogs/document.js	(.../document.js)	(revision 15483)
+++ branches/5.3.x/core/ckeditor/plugins/my_document/dialogs/document.js	(.../document.js)	(revision 16534)
@@ -18,7 +18,18 @@
 			}
 		};
 
+		var makeRelativeUrl = function ($url) {
+			if ( $url.indexOf(':/') == -1 && path.slice(0, 2) != '//' ) {
+				return $url;
+			}
 
+			var $link = document.createElement('a');
+
+			$link.href = $url;
+
+			return $link.pathname;
+		};
+
 		var parseLink = function( editor ) {
 			var retval = {
 					documentUrl: '',
@@ -343,7 +354,7 @@
 				this.commitContent( data );
 
 				var $filename = data.documentUrl.slice(data.documentUrl.lastIndexOf('\/') + 1);
-				var $icon_url = CKEDITOR.basePath.split('/');
+				var $icon_url = makeRelativeUrl(CKEDITOR.basePath).split('/');
 
 				$icon_url.splice($icon_url.length - 3); // remove "/core/ckeditor/"
 				$icon_url = $icon_url.join('/') + editor.config.documentIconsUrl;
@@ -371,4 +382,4 @@
 
 		};
 	}
-);
\ No newline at end of file
+);
Index: branches/5.3.x/core/kernel/application.php
===================================================================
diff -u -r16519 -r16534
--- branches/5.3.x/core/kernel/application.php	(.../application.php)	(revision 16519)
+++ branches/5.3.x/core/kernel/application.php	(.../application.php)	(revision 16534)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: application.php 16519 2017-01-20 20:21:46Z alex $
+* @version	$Id: application.php 16534 2017-01-29 18:28:39Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -724,6 +724,7 @@
 		// Misc.
 		$this->registerClass('kPhraseCache', KERNEL_PATH . '/languages/phrases_cache.php');
 		$this->registerClass('kModulesHelper', KERNEL_PATH . self::MODULE_HELPER_PATH);
+		$this->registerClass('CKEditor', FULL_PATH . '/core/ckeditor/ckeditor_php5.php');
 
 		// Aliased.
 		$this->registerClass('Params', KERNEL_PATH . '/utility/params.php', 'kActions');
Index: branches/5.3.x/core/units/helpers/helpers_config.php
===================================================================
diff -u -r16395 -r16534
--- branches/5.3.x/core/units/helpers/helpers_config.php	(.../helpers_config.php)	(revision 16395)
+++ branches/5.3.x/core/units/helpers/helpers_config.php	(.../helpers_config.php)	(revision 16534)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: helpers_config.php 16395 2016-11-12 12:43:14Z alex $
+* @version	$Id: helpers_config.php 16534 2017-01-29 18:28:39Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -29,6 +29,7 @@
 			Array ('pseudo' => 'FilenamesHelper', 'class' => 'kFilenamesHelper', 'file' => 'filenames_helper.php', 'build_event' => ''),
 			Array ('pseudo' => 'ClipboardHelper', 'class' => 'kClipboardHelper', 'file' => 'clipboard_helper.php', 'build_event' => ''),
 			Array ('pseudo' => 'ColumnPickerHelper', 'class' => 'kColumnPickerHelper', 'file' => 'col_picker_helper.php', 'build_event' => ''),
+			Array ('pseudo' => 'ColumnSet', 'class' => 'ColumnSet', 'file' => 'col_picker_helper.php', 'build_event' => ''),
 			Array ('pseudo' => 'ThemesHelper', 'class' => 'kThemesHelper', 'file' => 'themes_helper.php', 'build_event' => ''),
 			Array ('pseudo' => 'CaptchaHelper', 'class' => 'kCaptchaHelper', 'file' => 'captcha_helper.php', 'build_event' => ''),
 			Array ('pseudo' => 'PriorityHelper', 'class' => 'kPriorityHelper', 'file' => 'priority_helper.php', 'build_event' => ''),
Index: branches/5.3.x/core/kernel/nparser/ntags.php
===================================================================
diff -u -r16519 -r16534
--- branches/5.3.x/core/kernel/nparser/ntags.php	(.../ntags.php)	(revision 16519)
+++ branches/5.3.x/core/kernel/nparser/ntags.php	(.../ntags.php)	(revision 16534)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: ntags.php 16519 2017-01-20 20:21:46Z alex $
+* @version	$Id: ntags.php 16534 2017-01-29 18:28:39Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -413,17 +413,17 @@
 		$capture_params['name'] = '__capture_' . $param_name;
 
 		$capture_to_pass = $this->Parser->CompileParamsArray($capture_params);
-		$code[] = "if (isset(\$_parser->Captures['{$param_name}'])) {";
+		$code[] = "if (isset(\$_parser->Captures[\"{$param_name}\"])) {";
 		$code[] = "\t\${$param_name} = \$_parser->ParseBlock($capture_to_pass);";
-		$code[] = "\t\$params['{$param_name}'] = \${$param_name};";
-		$code[] = "\t\$tmp_{$param_name} = \${$param_name};";
+		$code[] = "\t\$params[\"{$param_name}\"] = \${$param_name};";
+		$code[] = "\t\$_param_value = \${$param_name};";
 		$code[] = "}";
 		$code[] = "else {";
 
 		$to_pass = $this->Parser->CompileParamsArray($tag['NP']);
 		$code[] = "\t" . '$_p_ =& $_parser->GetProcessor(\'m\');';
 		$code[] = "\t" . '$_tag_params = ' . $to_pass . ';';
-		$code[] = "\t\$tmp_{$param_name} = \$_p_->PostProcess(\${$param_name}, \$_p_->PreparePostProcess(\$_tag_params));";
+		$code[] = "\t\$_param_value = \$_p_->PostProcess(\${$param_name}, \$_p_->PreparePostProcess(\$_tag_params));";
 		$code[] = "}";
 
 		if ( array_key_exists('result_to_var', $tag['NP']) && $tag['NP']['result_to_var'] ) {
@@ -437,10 +437,10 @@
 			$code[] = "\$params['{$result_to_var}'] = \${$result_to_var};";
 		}
 		elseif ( array_key_exists('plus', $tag['NP']) ) {
-			$code[] = "\$tmp_{$param_name} += {$tag['NP']['plus']};";
+			$code[] = "\$_param_value += {$tag['NP']['plus']};";
 		}
 
-		$code[] = "echo (\$tmp_{$param_name});";
+		$code[] = "echo (\$_param_value);";
 
 		$this->AppendCode($o, $code);