Index: branches/5.3.x/core/kernel/utility/email.php
===================================================================
diff -u -N -r16395 -r16503
--- branches/5.3.x/core/kernel/utility/email.php	(.../email.php)	(revision 16395)
+++ branches/5.3.x/core/kernel/utility/email.php	(.../email.php)	(revision 16503)
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version	$Id: email.php 16395 2016-11-12 12:43:14Z alex $
+ * @version	$Id: email.php 16503 2016-12-26 18:16:21Z alex $
  * @package	In-Portal
  * @copyright	Copyright (C) 1997 - 2012 Intechnic. All rights reserved.
  * @license	  GNU/GPL
@@ -432,7 +432,11 @@
 					$this->fromEmail = $user_info['Email'];
 					$this->fromName = trim($user_info['FirstName'] . ' ' . $user_info['LastName']);
 
-					$user = $this->Application->recallObject('u.email-from', null, Array ('skip_autoload' => true));
+					$user = $this->Application->recallObject(
+						'u.email-from',
+						null,
+						array('live_table' => true, 'skip_autoload' => true)
+					);
 					/* @var $user UsersItem */
 
 					$user->Load($user_info['PortalUserId']);
@@ -602,7 +606,11 @@
 
 		array_unshift($this->recipients[EmailTemplate::RECIPIENT_TYPE_TO], $add_recipient);
 
-		$user = $this->Application->recallObject('u.email-to', null, Array('skip_autoload' => true));
+		$user = $this->Application->recallObject(
+			'u.email-to',
+			null,
+			array('live_table' => true, 'skip_autoload' => true)
+		);
 		/* @var $user UsersItem */
 
 		$user->Load($this->recipientUserId);
Index: branches/5.3.x/core/kernel/db/db_event_handler.php
===================================================================
diff -u -N -r16395 -r16503
--- branches/5.3.x/core/kernel/db/db_event_handler.php	(.../db_event_handler.php)	(revision 16395)
+++ branches/5.3.x/core/kernel/db/db_event_handler.php	(.../db_event_handler.php)	(revision 16503)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: db_event_handler.php 16395 2016-11-12 12:43:14Z alex $
+* @version	$Id: db_event_handler.php 16503 2016-12-26 18:16:21Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -2281,14 +2281,7 @@
 							break;
 					}
 
-					if ( $object->Update() ) {
-						$event->status = kEvent::erSUCCESS;
-					}
-					else {
-						$event->status = kEvent::erFAIL;
-						$event->redirect = false;
-						break;
-					}
+					$object->Update();
 				}
 			}
 
Index: branches/5.3.x/core/units/users/users_event_handler.php
===================================================================
diff -u -N -r16395 -r16503
--- branches/5.3.x/core/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 16395)
+++ branches/5.3.x/core/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 16503)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: users_event_handler.php 16395 2016-11-12 12:43:14Z alex $
+* @version	$Id: users_event_handler.php 16503 2016-12-26 18:16:21Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -154,7 +154,7 @@
 					return true;
 				}
 
-				if ( $event->Name == 'OnUpdate' && $user_id > 0 ) {
+				if ( substr($event->Name, 0, 8) == 'OnUpdate' && $user_id > 0 ) {
 					$user_dummy = $this->Application->recallObject($event->Prefix . '.-item', null, Array ('skip_autoload' => true));
 					/* @var $user_dummy UsersItem */
 
@@ -186,7 +186,7 @@
 					return is_numeric($this->getPassedID($event));
 				}
 
-				if ( $event->Name == 'OnUpdate' && $user_id <= 0 ) {
+				if ( substr($event->Name, 0, 8) == 'OnUpdate' && $user_id <= 0 ) {
 					// guests are not allowed to update their record, because they don't have it :)
 					return false;
 				}
@@ -908,6 +908,20 @@
 		}
 
 		/**
+		 * Updates kDBItem via AJAX.
+		 *
+		 * @param kEvent $event Event.
+		 *
+		 * @return void
+		 */
+		protected function OnUpdateAjax(kEvent $event)
+		{
+			/** @var AjaxFormHelper $ajax_form_helper */
+			$ajax_form_helper = $this->Application->recallObject('AjaxFormHelper');
+			$ajax_form_helper->transitEvent($event, 'OnUpdate');
+		}
+
+		/**
 		 * Checks state against country
 		 *
 		 * @param kEvent $event
Index: branches/5.3.x/index.php
===================================================================
diff -u -N -r16440 -r16503
--- branches/5.3.x/index.php	(.../index.php)	(revision 16440)
+++ branches/5.3.x/index.php	(.../index.php)	(revision 16503)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: index.php 16440 2016-11-18 11:17:08Z alex $
+* @version	$Id: index.php 16503 2016-12-26 18:16:21Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
Index: branches/5.3.x/core/ckeditor/plugins/my_link/plugin.js
===================================================================
diff -u -N -r16395 -r16503
--- branches/5.3.x/core/ckeditor/plugins/my_link/plugin.js	(.../plugin.js)	(revision 16395)
+++ branches/5.3.x/core/ckeditor/plugins/my_link/plugin.js	(.../plugin.js)	(revision 16503)
@@ -630,72 +630,48 @@
 							advAttr( 'advRel', 'rel' );
 						}
 
+						var selection = editor.getSelection();
 
 						// Browser need the "href" fro copy/paste link to work. (#6641)
-						attributes.href = attributes[ 'data-cke-saved-href' ];
+						attributes.href = attributes['data-cke-saved-href'];
 
-						if ( !this._.selectedElement )
-						{
-							// Create element if current selection is collapsed.
-							var selection = editor.getSelection(),
-								ranges = selection.getRanges( true );
-							if ( ranges.length == 1 && ranges[0].collapsed )
-							{
+						if ( !this._.selectedElement ) {
+							var range = selection.getRanges(1)[0];
+
+							// Use link URL as text with a collapsed cursor.
+							if ( range.collapsed ) {
 								// Short mailto link text view (#5736).
-								var text = new CKEDITOR.dom.text( data.type == 'email' ?
-										data.email.address : attributes[ 'data-cke-saved-href' ], editor.document );
-								ranges[0].insertNode( text );
-								ranges[0].selectNodeContents( text );
-								selection.selectRanges( ranges );
+								var text = new CKEDITOR.dom.text(data.type == 'email' ? data.email.address : attributes['data-cke-saved-href'], editor.document);
+								range.insertNode(text);
+								range.selectNodeContents(text);
 							}
 
 							// Apply style.
-							var style = new CKEDITOR.style( { element : 'a', attributes : attributes } );
-							style.type = CKEDITOR.STYLE_INLINE;		// need to override... dunno why.
-							style.apply( editor.document );
+							var style = new CKEDITOR.style({element: 'a', attributes: attributes});
+							style.type = CKEDITOR.STYLE_INLINE; // need to override... dunno why.
+							style.applyToRange(range);
+							range.select();
 						}
-						else
-						{
+						else {
 							// We're only editing an existing link, so just overwrite the attributes.
 							var element = this._.selectedElement,
-								href = element.data( 'cke-saved-href' ),
+								href = element.data('cke-saved-href'),
 								textView = element.getHtml();
 
-							// IE BUG: Setting the name attribute to an existing link doesn't work.
-							// Must re-create the link from weired syntax to workaround.
-							if ( CKEDITOR.env.ie && !( CKEDITOR.document.$.documentMode >= 8 ) && attributes.name != element.getAttribute( 'name' ) )
-							{
-								var newElement = new CKEDITOR.dom.element( '<a name="' + CKEDITOR.tools.htmlEncode( attributes.name ) + '">',
-										editor.document );
+							element.setAttributes(attributes);
+							element.removeAttributes(removeAttributes);
 
-								selection = editor.getSelection();
-
-								element.copyAttributes( newElement, { name : 1 } );
-								element.moveChildren( newElement );
-								newElement.replace( element );
-								element = newElement;
-
-								selection.selectElement( element );
+							if ( data.adv && data.adv.advName && CKEDITOR.plugins.link.synAnchorSelector ) {
+								element.addClass(element.getChildCount() ? 'cke_anchor' : 'cke_anchor_empty');
 							}
 
-							element.setAttributes( attributes );
-							element.removeAttributes( removeAttributes );
 							// Update text view when user changes protocol (#4612).
-							if ( href == textView || data.type == 'email' && textView.indexOf( '@' ) != -1 )
-							{
+							if ( href == textView || data.type == 'email' && textView.indexOf('@') != -1 ) {
 								// Short mailto link text view (#5736).
-								element.setHtml( data.type == 'email' ?
-									data.email.address : attributes[ 'data-cke-saved-href' ] );
+								element.setHtml(data.type == 'email' ? data.email.address : attributes['data-cke-saved-href']);
 							}
-							// Make the element display as an anchor if a name has been set.
-							if ( element.getAttribute( 'name' ) )
-								element.addClass( 'cke_anchor' );
-							else
-								element.removeClass( 'cke_anchor' );
 
-							if ( this.fakeObj )
-								editor.createFakeElement( element, 'cke_anchor', 'anchor' ).replace( this.fakeObj );
-
+							selection.selectElement(element);
 							delete this._.selectedElement;
 						}
 					};
Index: branches/5.3.x/core/install/upgrades.sql
===================================================================
diff -u -N -r16395 -r16503
--- branches/5.3.x/core/install/upgrades.sql	(.../upgrades.sql)	(revision 16395)
+++ branches/5.3.x/core/install/upgrades.sql	(.../upgrades.sql)	(revision 16503)
@@ -2934,6 +2934,7 @@
 WHERE TemplateName LIKE 'USER%';
 
 UPDATE SystemSettings SET VariableValue = 1 WHERE VariableName = 'CSVExportEncoding';
+ALTER TABLE Semaphores ADD MainIDs INT NULL DEFAULT NULL AFTER MainPrefix;
 
 # ===== v 5.3.0-B1 =====
 ALTER TABLE ScheduledTasks ADD Settings TEXT NULL;
Index: branches/5.3.x/core/install/install_schema.sql
===================================================================
diff -u -N -r16328 -r16503
--- branches/5.3.x/core/install/install_schema.sql	(.../install_schema.sql)	(revision 16328)
+++ branches/5.3.x/core/install/install_schema.sql	(.../install_schema.sql)	(revision 16503)
@@ -1319,6 +1319,7 @@
   SessionKey int(10) unsigned NOT NULL DEFAULT '0',
   `Timestamp` int(10) unsigned NOT NULL DEFAULT '0',
   MainPrefix varchar(255) NOT NULL DEFAULT '',
+  MainIDs text,
   PRIMARY KEY (SemaphoreId),
   KEY SessionKey (SessionKey),
   KEY `Timestamp` (`Timestamp`),
Index: branches/5.3.x/core/kernel/utility/logger.php
===================================================================
diff -u -N -r16395 -r16503
--- branches/5.3.x/core/kernel/utility/logger.php	(.../logger.php)	(revision 16395)
+++ branches/5.3.x/core/kernel/utility/logger.php	(.../logger.php)	(revision 16503)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: logger.php 16395 2016-11-12 12:43:14Z alex $
+* @version	$Id: logger.php 16503 2016-12-26 18:16:21Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2012 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -198,12 +198,18 @@
 	protected $_debugMode = false;
 
 	/**
-	 * Ignores backtrace record where following files are mentioned
+	 * Ignores backtrace record where following classes/files are mentioned
 	 *
-	 * @var Array
-	 * @access protected
+	 * @var array
 	 */
-	protected $_ignoreInTrace = Array ('logger.php', 'db_connection.php', 'db_load_balancer.php');
+	protected $_ignoreInTrace = array(
+		'kLogger' => 'logger.php',
+		'kErrorHandlerStack' => 'logger.php',
+		'kExceptionHandlerStack' => 'logger.php',
+		'kDBConnection' => 'db_connection.php',
+		'kDBConnectionDebug' => 'db_connection.php',
+		'kDBLoadBalancer' => 'db_load_balancer.php',
+	);
 
 	/**
 	 * Create event log
@@ -581,11 +587,14 @@
 		}
 
 		if ( isset($files) && is_array($files) ) {
-			while (true) {
+			$classes = array_keys($files);
+
+			while ( true ) {
 				$trace_info = $trace[0];
 				$file = isset($trace_info['file']) ? basename($trace_info['file']) : '';
+				$class = isset($trace_info['class']) ? $trace_info['class'] : '';
 
-				if ( !in_array($file, $files) ) {
+				if ( ($file && !in_array($file, $files)) || ($class && !in_array($class, $classes)) ) {
 					break;
 				}
 
Index: branches/5.3.x/core/units/helpers/deployment_helper.php
===================================================================
diff -u -N -r16111 -r16503
--- branches/5.3.x/core/units/helpers/deployment_helper.php	(.../deployment_helper.php)	(revision 16111)
+++ branches/5.3.x/core/units/helpers/deployment_helper.php	(.../deployment_helper.php)	(revision 16503)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: deployment_helper.php 16111 2014-12-07 14:49:01Z alex $
+* @version	$Id: deployment_helper.php 16503 2016-12-26 18:16:21Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2011 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -408,22 +408,25 @@
 			return false;
 		}
 
+		$revision_numbers = array();
+
 		foreach ( $matches as $index => $match ) {
 			$revision = $match[1][0];
 
-			if ( $this->revisionApplied($revision) ) {
-				// skip applied revisions
-				continue;
-			}
-
-			if ( isset($this->revisionSqls[$revision]) ) {
-				// duplicate revision among non-applied ones
+			if ( in_array($revision, $revision_numbers) ) {
 				$this->displayStatus('FAILED' . PHP_EOL . 'Duplicate revision #' . $revision . ' found');
 
 				return false;
 			}
 
-			// get revision sqls
+			$revision_numbers[] = $revision;
+
+			if ( $this->revisionApplied($revision) ) {
+				// Skip applied revisions.
+				continue;
+			}
+
+			// Get revision sqls.
 			$start_pos = $match[0][1] + strlen($match[0][0]);
 			$end_pos = isset($matches[$index + 1]) ? $matches[$index + 1][0][1] : strlen($sqls);
 			$revision_sqls = substr($sqls, $start_pos, $end_pos - $start_pos);
Index: branches/5.3.x/core/admin_templates/js/jquery/thickbox/thickbox.css
===================================================================
diff -u -N -r16395 -r16503
--- branches/5.3.x/core/admin_templates/js/jquery/thickbox/thickbox.css	(.../thickbox.css)	(revision 16395)
+++ branches/5.3.x/core/admin_templates/js/jquery/thickbox/thickbox.css	(.../thickbox.css)	(revision 16503)
@@ -172,7 +172,7 @@
 	clear:both;
 	border:none;
 	margin-bottom:-1px;
-	/*margin-top:1px;*/
+	margin-top:0;
 	_margin-bottom:1px;
 }
 
Index: branches/5.3.x/core/admin_templates/config/config_universal.tpl
===================================================================
diff -u -N -r16111 -r16503
--- branches/5.3.x/core/admin_templates/config/config_universal.tpl	(.../config_universal.tpl)	(revision 16111)
+++ branches/5.3.x/core/admin_templates/config/config_universal.tpl	(.../config_universal.tpl)	(revision 16503)
@@ -1,6 +1,6 @@
 <inp2:m_include t="incs/header"/>
 
-<inp2:conf_InitList name="Default" per_page="-1"/>
+<inp2:conf_InitList per_page="-1"/>
 <inp2:m_Get name="section" no_html_escape="1" result_to_var="section"/>
 <inp2:m_RenderElement name="combined_header" prefix="conf" section="$section" title_preset="section_label" perm_event="conf:OnLoad"/>
 
Index: branches/5.3.x/core/kernel/utility/formatters/password_formatter.php
===================================================================
diff -u -N -r16111 -r16503
--- branches/5.3.x/core/kernel/utility/formatters/password_formatter.php	(.../password_formatter.php)	(revision 16111)
+++ branches/5.3.x/core/kernel/utility/formatters/password_formatter.php	(.../password_formatter.php)	(revision 16503)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: password_formatter.php 16111 2014-12-07 14:49:01Z alex $
+* @version	$Id: password_formatter.php 16503 2016-12-26 18:16:21Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2011 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -208,7 +208,8 @@
 				break;
 
 			case PasswordHashingMethod::MD5_AND_PHPPASS:
-				return $this->_phpPass->hashPassword($this->_md5hash($password, $salt, true));
+				$password_hashed = preg_match('/^[a-f0-9]{32}$/', $password);
+				return $this->_phpPass->hashPassword($this->_md5hash($password, $salt, $password_hashed));
 				break;
 
 			case PasswordHashingMethod::PHPPASS:
Index: branches/5.3.x/core/units/categories/categories_event_handler.php
===================================================================
diff -u -N -r16395 -r16503
--- branches/5.3.x/core/units/categories/categories_event_handler.php	(.../categories_event_handler.php)	(revision 16395)
+++ branches/5.3.x/core/units/categories/categories_event_handler.php	(.../categories_event_handler.php)	(revision 16503)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: categories_event_handler.php 16395 2016-11-12 12:43:14Z alex $
+* @version	$Id: categories_event_handler.php 16503 2016-12-26 18:16:21Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -1610,16 +1610,9 @@
 							$this->Conn->Query($sql);
 						}
 
-						$event->status = kEvent::erSUCCESS;
-
 						$email_event = $event->Name == 'OnMassApprove' ? 'CATEGORY.APPROVE' : 'CATEGORY.DENY';
 						$this->Application->emailUser($email_event, $object->GetDBField('CreatedById'), $object->getEmailParams());
 					}
-					else {
-						$event->status = kEvent::erFAIL;
-						$event->redirect = false;
-						break;
-					}
 				}
 			}
 
@@ -1835,9 +1828,6 @@
 			$object = $event->getObject();
 			/* @var $object CategoriesItem */
 
-			$object->checkFilename();
-			$object->generateFilename();
-
 			$now = time();
 
 			if ( !$this->Application->isDebugMode() && strpos($event->Special, 'rebuild') === false ) {
@@ -1852,6 +1842,9 @@
 				}
 			}
 
+			$object->checkFilename();
+			$object->generateFilename();
+
 			// Don't allow creating records on behalf of another user.
 			if ( !$this->Application->isAdminUser && !defined('CRON') ) {
 				$object->SetDBField('CreatedById', $object->GetOriginalField('CreatedById'));
Index: branches/5.3.x/core/units/visits/visits_tag_processor.php
===================================================================
diff -u -N -r16395 -r16503
--- branches/5.3.x/core/units/visits/visits_tag_processor.php	(.../visits_tag_processor.php)	(revision 16395)
+++ branches/5.3.x/core/units/visits/visits_tag_processor.php	(.../visits_tag_processor.php)	(revision 16503)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: visits_tag_processor.php 16395 2016-11-12 12:43:14Z alex $
+* @version	$Id: visits_tag_processor.php 16503 2016-12-26 18:16:21Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -165,7 +165,8 @@
 		 */
 		function &GetList($params)
 		{
-			$list_name = $this->SelectParam($params, 'list_name,name');
+			$list_name = array_key_exists('list_name', $params) ? $params['list_name'] : '';
+
 			if ( !$list_name ) {
 				$list_name = $this->Application->Parser->GetParam('list_name');
 			}
Index: branches/5.3.x/core/admin_templates/head.tpl
===================================================================
diff -u -N -r16111 -r16503
--- branches/5.3.x/core/admin_templates/head.tpl	(.../head.tpl)	(revision 16111)
+++ branches/5.3.x/core/admin_templates/head.tpl	(.../head.tpl)	(revision 16503)
@@ -110,13 +110,16 @@
 	}
 
 	function change_password() {
-		getFrame('main').set_hidden_field('u_id', <inp2:m_get name="u.current_id" no_html_escape="1" js_escape="1"/>);
+		var $user_id = Number('<inp2:m_get name="u.current_id" no_html_escape="1" js_escape="1"/>');
 
-		<inp2:m_if check="m_GetEquals" name="u.current_id" value="-1">
-			open_popup('u', '', 'users/root_edit_password');
-		<inp2:m_else/>
-			open_popup('u', '', 'users/user_edit_password');
-		</inp2:m_if>
+		if ( $modal_windows ) {
+			getFrame('main').set_hidden_field('u_id', $user_id);
+		}
+		else {
+			set_hidden_field('u_id', $user_id);
+		}
+
+		open_popup('u', '', '<inp2:m_if check="m_GetEquals" name="u.current_id" value="-1">users/root_edit_password<inp2:m_else/>users/user_edit_password</inp2:m_if>');
 	}
 
 	$FrameResizer = new FrameResizer('<inp2:m_Phrase name="la_ToolTip_ShowMenu" js_escape="1"/>', '<inp2:m_Phrase name="la_ToolTip_HideMenu" js_escape="1"/>', window.parent, '<inp2:m_Link pass="m,adm" adm_event="OnSaveSetting" var_name="#NAME#" var_value="#VALUE#" no_amp="1" js_escape="1"/>', <inp2:adm_MenuFrameWidth/>);
Index: branches/5.3.x/core/install/upgrades.css
===================================================================
diff -u -N -r15914 -r16503
--- branches/5.3.x/core/install/upgrades.css	(.../upgrades.css)	(revision 15914)
+++ branches/5.3.x/core/install/upgrades.css	(.../upgrades.css)	(revision 16503)
@@ -818,15 +818,32 @@
  
  /* Right side of bluebar */
 
+# ===== v 5.2.2-B1 =====
+Index: style_template.css
+===================================================================
+--- style_template.css	(revision 16300)
++++ style_template.css	(working copy)
+@@ -549,6 +549,10 @@
+ 	border-collapse: separate
+ }
+ 
++label.checkbox {
++	white-space: nowrap;
++}
++
+ /* Uploader */
+ .uploader-queue div.file {
+ 	font-size: 11px;
+
 # ===== v 5.3.0-B1 =====
 Index: style_template.css
 ===================================================================
---- style_template.css	(revision 15483)
+--- style_template.css	(revision 16502)
 +++ style_template.css	(working copy)
 @@ -487,6 +487,14 @@
  	vertical-align: middle;
  }
-
+ 
 +.CodeMirror {
 +	font-size: 13px;
 +	border: 1px solid black;
@@ -838,12 +855,10 @@
  .label-cell-filler {
  	background: #DEE7F6 none;
  }
-@@ -496,6 +504,18 @@
- }
- .control-cell-filler {
+@@ -498,6 +506,18 @@
  	background: #fff none;
-+}
-+
+ }
+ 
 +.highlight-area, .code-highlight-area {
 +	border: 1px solid black;
 +	padding: 8px;
@@ -854,7 +869,8 @@
 +
 +.code-highlight-area {
 +	background-color: #F6F6F6;
- }
-
++}
++
  .error {
-\ No newline at end of file
+ 	color: red;
+ }
Index: branches/5.3.x/core/admin_templates/incs/style_template.css
===================================================================
diff -u -N -r15914 -r16503
--- branches/5.3.x/core/admin_templates/incs/style_template.css	(.../style_template.css)	(revision 15914)
+++ branches/5.3.x/core/admin_templates/incs/style_template.css	(.../style_template.css)	(revision 16503)
@@ -569,6 +569,10 @@
 	border-collapse: separate
 }
 
+label.checkbox {
+	white-space: nowrap;
+}
+
 /* Uploader */
 .uploader-queue div.file {
 	font-size: 11px;
@@ -816,4 +820,4 @@
 	border-width: 0px !important;
 	-moz-border-radius: 0px !important;
 	-webkit-border-radius: 0px !important;
-}
\ No newline at end of file
+}
Index: branches/5.3.x/core/ckeditor/ckfinder/config.php
===================================================================
diff -u -N -r16395 -r16503
--- branches/5.3.x/core/ckeditor/ckfinder/config.php	(.../config.php)	(revision 16395)
+++ branches/5.3.x/core/ckeditor/ckfinder/config.php	(.../config.php)	(revision 16503)
@@ -221,7 +221,7 @@
 		'url' => $baseUrl . 'Files',
 		'directory' => $baseDir . 'Files',
 		'maxSize' => 0,
-		'allowedExtensions' => 'jpg,gif,jpeg,png,swf,fla,jpg,gif,jpeg,png,avi,mpg,mpeg,zip,rar,arj,gz,tar,doc,pdf,ppt,rdp,swf,swt,txt,vsd,xls,csv,odt',
+		'allowedExtensions' => 'jpg,gif,jpeg,png,swf,fla,jpg,gif,jpeg,png,avi,mpg,mpeg,zip,rar,arj,gz,tar,doc,docx,dotx,docm,dotm,pdf,ppt,pptx,potx,ppsx,ppam,pptm,potm,ppsm,rdp,swf,swt,txt,vsd,xls,xlsx,xltx,xlsm,xltm,xlam,xlsb,csv,odt',
 		'deniedExtensions' => 'php,asp,aspx,ascx,jsp,cfm,cfc,pl,bat,exe,dll,reg');
 
 $config['ResourceType'][] = Array(
@@ -253,7 +253,7 @@
 		'url' => $baseUrl . 'Documents',
 		'directory' => $baseDir . 'Documents',
 		'maxSize' => 0,
-		'allowedExtensions' => 'doc,pdf,ppt,rdp,swf,swt,txt,vsd,xls,csv,zip,odt',
+		'allowedExtensions' => 'doc,docx,dotx,docm,dotm,pdf,ppt,pptx,potx,ppsx,ppam,pptm,potm,ppsm,rdp,swf,swt,txt,vsd,xls,xlsx,xltx,xlsm,xltm,xlam,xlsb,csv,zip,odt',
 		'deniedExtensions' => 'php,asp,aspx,ascx,jsp,cfm,cfc,pl,bat,exe,dll,reg');
 
 /*
Index: branches/5.3.x/core/kernel/db/db_tag_processor.php
===================================================================
diff -u -N -r16395 -r16503
--- branches/5.3.x/core/kernel/db/db_tag_processor.php	(.../db_tag_processor.php)	(revision 16395)
+++ branches/5.3.x/core/kernel/db/db_tag_processor.php	(.../db_tag_processor.php)	(revision 16503)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: db_tag_processor.php 16395 2016-11-12 12:43:14Z alex $
+* @version	$Id: db_tag_processor.php 16503 2016-12-26 18:16:21Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -349,7 +349,8 @@
 	 */
 	function &GetList($params)
 	{
-		$list_name = $this->SelectParam($params, 'list_name,name');
+		$list_name = array_key_exists('list_name', $params) ? $params['list_name'] : '';
+
 		if ( !$list_name ) {
 			$list_name = $this->Application->Parser->GetParam('list_name');
 		}
@@ -2105,6 +2106,9 @@
 			case 'total':
 				return $object->GetRecordsCount(false);
 
+			case 'selected':
+				return $object->GetSelectedCount();
+
 			case 'from':
 				return $object->GetRecordsCount() ? $object->GetOffset() + 1 : 0; //0-based
 
@@ -2295,6 +2299,20 @@
 	}
 
 	/**
+	 * Returns selected records count.
+	 *
+	 * @param array $params Tag params.
+	 *
+	 * @return string
+	 */
+	protected function SelectedRecords(array $params)
+	{
+		$list =& $this->GetList($params);
+
+		return $list->GetSelectedCount();
+	}
+
+	/**
 	 * Range filter field name
 	 *
 	 * @param Array $params
@@ -2656,7 +2674,7 @@
 		}
 
 		$icon_url = $this->Application->BaseURL() . 'core/admin_templates/img/top_frame/icons/' . $button_icon;
-		$button_onclick = '$form_name = ' . json_encode($form_name) . '; std_edit_item(' . json_encode($item_prefix) . ', ' . json_encode($template) . ');';
+		$button_onclick = '$form_name = ' . json_encode($form_name) . '; std_edit_item(' . json_encode($item_prefix) . ', ' . json_encode($template) . '); return false;';
 
 		$button_code = '<button
 			style="background-image: url(' . $icon_url . ');"
Index: branches/5.3.x/core/install/install_data.sql
===================================================================
diff -u -N -r16395 -r16503
--- branches/5.3.x/core/install/install_data.sql	(.../install_data.sql)	(revision 16395)
+++ branches/5.3.x/core/install/install_data.sql	(.../install_data.sql)	(revision 16503)
@@ -749,7 +749,7 @@
 INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:module_deployment_log.edit', 11, 1, 1, 0);
 INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:module_deployment_log.delete', 11, 1, 1, 0);
 
-INSERT INTO AdminSkins VALUES(DEFAULT, 'Default', '/* General elements */\r\n\r\nhtml {\r\n	height: 100%;\r\n}\r\n\r\nbody {\r\n 	font-family: verdana,arial,helvetica,sans-serif;\r\n 	color: #000000;\r\n	overflow-x: auto; overflow-y: auto;\r\n	margin: 0px 0px 0px 0px;\r\n	text-decoration: none;\r\n}\r\n\r\nbody, td {\r\n	/* fix for Firefox, when font-size was not inherited in table cells */\r\n	font-size: 9pt;\r\n}\r\n\r\na {\r\n	color: #006699;\r\n	text-decoration: none;\r\n}\r\n\r\na:hover {\r\n	color: #009ff0;\r\n	text-decoration: none;\r\n}\r\n\r\nform {\r\n   display: inline;\r\n}\r\n\r\nimg { border: 0px; }\r\n\r\nbody.height-100 {\r\n	height: 100%;\r\n}\r\n\r\nbody.regular-body {\r\n	margin: 0px 10px 5px 10px;\r\n	color: #000000;\r\n	background-color: @@SectionBgColor@@;\r\n}\r\n\r\nbody.edit-popup {\r\n	margin: 0px 0px 0px 0px;\r\n}\r\n\r\ntable.collapsed {\r\n	border-collapse: collapse;\r\n}\r\n\r\n.bordered, table.bordered, .bordered-no-bottom {\r\n	border: 1px solid #000000 !important;\r\n	border-top-width: 0px;\r\n	border-collapse: collapse;\r\n}\r\n\r\n.bordered-no-bottom {\r\n	border-top-width: 1px;\r\n	border-bottom: none;\r\n}\r\n\r\n.login-table td {\r\n	padding: 1px;\r\n}\r\n\r\n.disabled {\r\n	background-color: #ebebeb;\r\n}\r\n\r\n/* Head frame */\r\ntable.head-table {\r\n	background: url(''@@base_url@@/core/admin_templates/img/top_frame/right_background.png'') top right @@HeadBgColor@@ no-repeat;\r\n}\r\n\r\n.head-table tr td, .head-table tr td a {\r\n	color: @@HeadColor@@\r\n}\r\n\r\ndiv#extra_toolbar td.button-active {\r\n	background: url(''@@base_url@@/core/admin_templates/img/top_frame/toolbar_button_background.gif'') bottom left repeat-x;\r\n	height: 22px;\r\n}\r\n\r\ndiv#extra_toolbar td.button-active a {\r\n	color: black;\r\n	text-decoration: none;\r\n}\r\n\r\ntd.kx-block-header, .head-table tr td.kx-block-header{\r\n	color: @@HeadBarColor@@;\r\n	background: url(''@@base_url@@/core/admin_templates/img/top_frame/toolbar_background.gif'') repeat-x top left;\r\n	/*background-color: @@HeadBarBgColor@@;*/\r\n	padding-left: 7px;\r\n	padding-right: 7px;\r\n}\r\n\r\na.kx-header-link {\r\n	text-decoration: underline;\r\n	font-weight: bold;\r\n	color: #0080C8;\r\n}\r\n\r\na.kx-header-link:hover {\r\n	color: #FFCB05;\r\n	text-decoration: none;\r\n}\r\n\r\n.kx-secondary-foreground 	{\r\n	color: #FFFFFF;\r\n	/*background-color: @@HeadBarBgColor@@;*/\r\n}\r\n\r\n.kx-login-button {\r\n	background-color: #2D79D6;\r\n	color: #FFFFFF;\r\n}\r\n\r\n/* General form button (yellow) */\r\n.button {\r\n	font-size: 12px;\r\n	font-weight: normal;\r\n	color: #000000;\r\n	background: url(''@@base_url@@/core/admin_templates/img/button_back.gif'') #f9eeae repeat-x;\r\n	text-decoration: none;\r\n}\r\n\r\n/* Disabled (grayed-out) form button */\r\n.button-disabled {\r\n	font-size: 12px;\r\n	font-weight: normal;\r\n	color: #676767;\r\n	background: url(''@@base_url@@/core/admin_templates/img/button_back_disabled.gif'') #f9eeae repeat-x;\r\n	text-decoration: none;\r\n}\r\n\r\n/* Tabs bar */\r\n\r\n.tab, .tab-active {\r\n	background-color: #F0F1EB;\r\n	padding: 3px 7px 2px 7px;\r\n	border-top: 1px solid black;\r\n	border-left: 1px solid black;\r\n	border-right: 1px solid black;\r\n	margin-left: 3px !important;\r\n	white-space: nowrap;\r\n}\r\n\r\n.tab-active {\r\n	background-color: #4487D9;\r\n}\r\n\r\n.tab a {\r\n	color: #4487D9;\r\n	font-weight: bold;\r\n}\r\n\r\n.tab-active a {\r\n	color: #FFFFFF;\r\n	font-weight: bold;\r\n}\r\n\r\na.scroll-left, a.scroll-right {\r\n	cursor: pointer;\r\n	display: block;\r\n	float: left;\r\n	height: 18px;\r\n	margin: 0px 1px;\r\n	width: 18px;\r\n}\r\n\r\na.scroll-left {\r\n	background: transparent url(''@@base_url@@/core/admin_templates/img/tabs/left.png'') no-repeat scroll 0 0;\r\n}\r\n\r\na.scroll-right {\r\n	background: transparent url(''@@base_url@@/core/admin_templates/img/tabs/right.png'') no-repeat scroll 0 0;\r\n}\r\n\r\na.disabled {\r\n	visibility: hidden !important;\r\n}\r\n\r\na.scroll-left:hover, a.scroll-right:hover {\r\n	background-position: 0 -18px;\r\n}\r\n\r\ntd.scroll-right-container {\r\n	width: 20px;\r\n}\r\n\r\ntd.scroll-right-container.disabled, td.scroll-right-container.disabled * {\r\n	width: 0px;\r\n	margin: 0px;\r\n}\r\n\r\ntd.scroll-right-container.disabled br {\r\n	display: none;\r\n}\r\n\r\n/* Toolbar */\r\n\r\n.toolbar {\r\n	font-size: 8pt;\r\n	border: 1px solid #000000;\r\n	border-width: 0px 1px 1px 1px;\r\n	background-color: @@ToolbarBgColor@@;\r\n	border-collapse: collapse;\r\n}\r\n\r\n.toolbar td {\r\n	height: 100%;\r\n}\r\n\r\n.toolbar-button, .toolbar-button-disabled, .toolbar-button-over {\r\n	float: left;\r\n	text-align: center;\r\n	font-size: 8pt;\r\n	padding: 5px 5px 5px 5px;\r\n	vertical-align: middle;\r\n	color: #006F99;\r\n}\r\n\r\n.toolbar-button-over {\r\n	color: #000;\r\n}\r\n\r\n.toolbar-button-disabled {\r\n	color: #444;\r\n}\r\n\r\n/*  Scrollable Grids */\r\n\r\n\r\n.layout-only-table td {\r\n  border: none !important;\r\n}\r\n\r\n/* Main Grid class */\r\n.grid-scrollable {\r\n	padding: 0px;\r\n	border: 1px solid black !important;\r\n	border-top: none !important;\r\n}\r\n\r\n/* Div generated by js, which contains all the scrollable grid elements, affects the style of scrollable area without data (if there are too few rows) */\r\n.grid-container {\r\n	background-color: #fff;\r\n}\r\n\r\n.grid-container table {\r\n	border-collapse: collapse;\r\n}\r\n\r\n/* Inner div generated in each data-cell */\r\n.grid-cell-div {\r\n	overflow: hidden;\r\n	height: auto;\r\n}\r\n\r\n/* Main row definition */\r\n.grid-data-row td, .grid-data-row-selected td, .grid-data-row-even-selected td, .grid-data-row-mouseover td, .table-color1, .table-color2, .grid-edit-table .edit-form-odd > td, .grid-edit-table .edit-form-even > td {\r\n	font-weight: normal;\r\n	color: @@OddColor@@;\r\n	background-color: @@OddBgColor@@;\r\n	padding: 3px 5px 3px 5px;\r\n	overflow: hidden;\r\n	border-right: 1px solid #c9c9c9;\r\n}\r\n.grid-data-row-even td, .table-color2, .grid-edit-table .edit-form-even > td {\r\n	background-color: @@EvenBgColor@@;\r\n	color: @@EvenColor@@;\r\n}\r\n.grid-data-row td a, .grid-data-row-selected td a, .grid-data-row-mouseover td a {\r\n	text-decoration: underline;\r\n}\r\n\r\n/* mouse-over rows */\r\n.grid-data-row-mouseover td, table tr.grid-data-row[_row_highlighted] td {\r\n	background: #FFFDF4;\r\n}\r\n\r\n/* Selected row, applies to both checkbox and data areas */\r\n.grid-data-row-selected td, table tr.grid-data-row[_row_selected] td {\r\n	background: #FEF2D6;\r\n}\r\n\r\n.grid-data-row-even-selected td, .grid-data-row-even[_row_selected] td {\r\n	background: #FFF7E0;\r\n}\r\n\r\n/* General header cell definition */\r\n.grid-header-row td {\r\n	font-weight: bold;\r\n	background-color: @@ColumnTitlesBgColor@@;\r\n	text-decoration: none;\r\n	padding: 3px 5px 3px 5px;\r\n	color: @@ColumnTitlesColor@@;\r\n	border-right: none;\r\n	text-align: left;\r\n	vertical-align: middle !important;\r\n	white-space: nowrap;\r\n	border-right: 1px solid #777;\r\n}\r\n\r\n/* Filters row */\r\ntr.grid-header-row-1 td {\r\n	background-color: @@FiltersBgColor@@;\r\n	border-bottom: 1px solid black;\r\n}\r\n\r\n/* Grid Filters */\r\ntable.range-filter {\r\n	width: 100%;\r\n}\r\n\r\n.range-filter td {\r\n	padding: 0px 0px 2px 2px !important;\r\n	border: none !important;\r\n	font-size: 8pt !important;\r\n	font-weight: normal !important;\r\n	text-align: left;\r\n	color: #000000 !important;\r\n}\r\n\r\ninput.filter, select.filter, input.filter-active, select.filter-active {\r\n	margin-bottom: 0px;\r\n	border: 1px solid #aaa;\r\n}\r\n\r\ninput.filter-active {\r\n  background-color: #FFFF00;\r\n}\r\n\r\nselect.filter-active {\r\n background-color: #FFFF00;\r\n}\r\n\r\ndiv.filter, div.filter-active {\r\n	background-color: white;\r\n	border: 1px solid #AAAAAA;\r\n	color: black;\r\n	font-weight: normal;\r\n	padding: 3px;\r\n}\r\n\r\ndiv.filter-active {\r\n	background-color: #FFFF00;\r\n}\r\n\r\ndiv.multioptions_filter {\r\n	position: absolute;\r\n	z-index: 100;\r\n	color: black;\r\n	background-color: white;\r\n	border: 1px solid black;\r\n	padding: 3px 5px;\r\n	display: none;\r\n	vertical-align: middle;\r\n}\r\n\r\n/* Column titles row */\r\ntr.grid-header-row-0 td {\r\n	height: 25px;\r\n	font-weight: bold;\r\n	background-color: @@ColumnTitlesBgColor@@;\r\n	color: @@ColumnTitlesColor@@;\r\n	border-bottom: 1px solid black;\r\n}\r\n\r\ntr.grid-header-row-0 td a {\r\n	color: @@ColumnTitlesColor@@;\r\n}\r\n\r\ntr.grid-header-row-0 td a:hover {\r\n	color: #FFCC00;\r\n}\r\n\r\n\r\n.grid-footer-row td {\r\n	background-color: #D7D7D7;\r\n	font-weight: bold;\r\n	border-right: 1px solid #C9C9C9;\r\n	padding: 3px 5px 3px 5px;\r\n}\r\n\r\ntd.grid-header-last-cell, td.grid-data-last-cell, td.grid-footer-last-cell {\r\n	border-right: none !important;\r\n}\r\n\r\ntd.grid-data-col-0, td.grid-data-col-0 div {\r\n	text-align: center;\r\n	vertical-align: middle !important;\r\n}\r\n\r\ntr.grid-header-row-1 td.grid-header-col-1 {\r\n	text-align: center;\r\n	vertical-align: middle !important;\r\n}\r\n\r\ntr.grid-header-row-1 td.grid-header-col-1 div {\r\n	display: table-cell;\r\n	vertical-align: middle;\r\n}\r\n\r\n.grid-status-bar {\r\n	border: 1px solid black;\r\n	border-top: none;\r\n	padding: 0px;\r\n	width: 100%;\r\n	border-collapse: collapse;\r\n	height: 30px;\r\n}\r\n\r\n.grid-status-bar td {\r\n	background-color: @@TitleBarBgColor@@;\r\n	color: @@TitleBarColor@@;\r\n	font-size: 11pt;\r\n	font-weight: normal;\r\n	padding: 2px 8px 2px 8px;\r\n}\r\n\r\n/*  /Scrollable Grids */\r\n\r\n\r\n/* Forms */\r\ntable.edit-form {\r\n	border: none;\r\n	border-top-width: 0px !important;\r\n	border-collapse: collapse;\r\n	width: 100%;\r\n}\r\n\r\n.edit-form-odd, .edit-form-even {\r\n	padding: 0px;\r\n}\r\n\r\n.subsectiontitle {\r\n	font-size: 10pt;\r\n	font-weight: bold;\r\n	background-color: #4A92CE;\r\n	color: #fff;\r\n	height: 25px;\r\n	border-top: 1px solid black;\r\n	vertical-align: middle;\r\n}\r\n\r\n/* remove top-border from first sub-section element */\r\ntable.edit-form .subsectiontitle:first-child, table.bordered .subsectiontitle:first-child {\r\n	border-top-width: 0;\r\n}\r\n\r\n.subsectiontitle td {\r\n	vertical-align: middle;\r\n	/*padding: 3px 5px 3px 5px;*/\r\n	padding: 1px 5px;\r\n}\r\n\r\n.label-cell {\r\n	background: #DEE7F6 url(''@@base_url@@/core/admin_templates/img/bgr_input_name_line.gif'') no-repeat right bottom;\r\n  font: 12px arial, sans-serif;\r\n  padding: 4px 20px;\r\n  width: 160px;\r\n}\r\n\r\n.control-mid {\r\n	width: 13px;\r\n	border-left: 1px solid #7A95C2;\r\n	background: #fff url(''@@base_url@@/core/admin_templates/img/bgr_mid.gif'') repeat-x left bottom;\r\n}\r\n\r\n.control-cell {\r\n	font: 11px arial, sans-serif;\r\n	padding: 4px 10px 5px 5px;\r\n	background: #fff url(''@@base_url@@/core/admin_templates/img/bgr_input_line.gif'') no-repeat left bottom;\r\n	width: auto;\r\n	vertical-align: middle;\r\n}\r\n\r\n.CodeMirror {\r\n	font-size: 13px;\r\n	border: 1px solid black;\r\n}\r\n\r\n.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}\r\n.CodeMirror-activeline-background {background: #e8f2ff !important;}\r\n\r\n.label-cell-filler {\r\n	background: #DEE7F6 none;\r\n}\r\n.control-mid-filler {\r\n	background: #fff none;\r\n	border-left: 1px solid #7A95C2;\r\n}\r\n.control-cell-filler {\r\n	background: #fff none;\r\n}\r\n\r\n.highlight-area, .code-highlight-area {\r\n	border: 1px solid black;\r\n	padding: 8px;\r\n	font-family: monospace !important;\r\n	font-size: 12px;\r\n	overflow: auto;\r\n}\r\n\r\n.code-highlight-area {\r\n	background-color: #F6F6F6;\r\n}\r\n\r\n.error {\r\n	color: red;\r\n}\r\n.error-cell {\r\n	color: red;\r\n}\r\n\r\n.field-required {\r\n	color: red;\r\n}\r\n\r\n.warning-table {\r\n	background-color: #F0F1EB;\r\n	border: 1px solid #000000;\r\n	border-collapse: collapse;\r\n	border-top-width: 0px;\r\n}\r\n\r\n.form-notice, .form-warning {\r\n	font-size: 11px;\r\n}\r\n\r\n.form-warning {\r\n	color: red;\r\n}\r\n\r\n.form-notice {\r\n	color: green;\r\n}\r\n\r\n.priority {\r\n	color: red;\r\n	padding-left: 1px;\r\n	padding-right: 1px;\r\n	font-size: 11px;\r\n}\r\n\r\n.small-statistics {\r\n	font-size: 11px;\r\n	color: #707070;\r\n}\r\n\r\n.req-note {\r\n	font-style: italic;\r\n	color: #333;\r\n}\r\n\r\n#scroll_container table.tableborder {\r\n	border-collapse: separate\r\n}\r\n\r\n/* Uploader */\r\n.uploader-queue div.file {\r\n	font-size: 11px;\r\n	border: 1px solid #7F99C5;\r\n	padding: 3px;\r\n	background-color: #DEE7F6;\r\n	margin-bottom: 2px;\r\n}\r\n\r\n.uploader-queue .left  {\r\n	float: left;\r\n	vertical-align: top;\r\n}\r\n\r\n.uploader-queue .file-label {\r\n	margin-left: 5px;\r\n}\r\n\r\n.uploader-queue .preview .delete-checkbox {\r\n	margin-top: -3px;\r\n}\r\n\r\n.uploader-queue .progress-container {\r\n	margin: 2px 5px 0px 5px;\r\n}\r\n\r\n.uploader-queue .progress-empty {\r\n	width: 150px;\r\n	height: 9px;\r\n	border: 1px solid black;\r\n	background: url(''@@base_url@@/core/admin_templates/img/progress_left.gif'') repeat-x;\r\n}\r\n\r\n.uploader-queue .progress-full {\r\n	height: 9px;\r\n	background: url(''@@base_url@@/core/admin_templates/img/progress_done.gif'');\r\n}\r\n\r\n.uploader-queue .thumbnail {\r\n	/*margin-bottom: 2px;*/\r\n	border: 1px solid black;\r\n	background-color: grey;\r\n}\r\n\r\n/* To be sorted */\r\nspan#category_path, span#category_path a {\r\n	color: #FFFFFF;\r\n}\r\n\r\nspan#category_path a {\r\n	text-decoration: underline;\r\n}\r\n\r\n/* Section title, right to the big icon */\r\n.admintitle {\r\n	font-size: 16pt;\r\n	font-weight: bold;\r\n	color: @@SectionColor@@;\r\n	text-decoration: none;\r\n}\r\n\r\n/* Page header (bluebar) */\r\n.page-title td {\r\n	background-color: @@TitleBarBgColor@@;\r\n	color: @@TitleBarColor@@;\r\n	font-size: 11pt;\r\n	font-weight: normal;\r\n	padding: 2px 8px 2px 8px;\r\n}\r\n\r\n/* Right side of bluebar */\r\n.tablenav, tablenav a {\r\n	font-size: 11pt;\r\n	font-weight: bold;\r\n	color: @@TitleBarColor@@;\r\n\r\n	text-decoration: none;\r\n	background-color: @@TitleBarBgColor@@;\r\n	background-image: none;\r\n}\r\n\r\n/* Section title in the bluebar * -- why ''link''? :S */\r\n.tablenav_link {\r\n	font-size: 11pt;\r\n	font-weight: bold;\r\n	color: @@TitleBarColor@@;\r\n	text-decoration: none;\r\n}\r\n\r\n/* Active page in top and bottom bluebars pagination */\r\n.current_page {\r\n	font-size: 10pt;\r\n	font-weight: bold;\r\n	background-color: #fff;\r\n	color: #2D79D6;\r\n	padding: 3px 2px 3px 3px;\r\n}\r\n\r\n/* Other pages and arrows in pagination on blue */\r\n.nav_url {\r\n	font-size: 10pt;\r\n	font-weight: bold;\r\n	color: #fff;\r\n	padding: 3px 2px 3px 3px;\r\n}\r\n\r\n/* Tree */\r\n.tree-body {\r\n	background-color: @@TreeBgColor@@;\r\n	height: 100%\r\n}\r\n\r\n.tree_head.td, .tree_head, .tree_head:hover {\r\n font-weight: bold;\r\n font-size: 10px;\r\n color: #FFFFFF;\r\n font-family: Verdana, Arial;\r\n text-decoration: none;\r\n}\r\n\r\n.tree {\r\n	padding: 0px;\r\n	border: none;\r\n	border-collapse: collapse;\r\n}\r\n\r\n.tree tr td {\r\n	padding: 0px;\r\n	margin: 0px;\r\n	font-family: helvetica, arial, verdana,;\r\n	font-size: 11px;\r\n	white-space: nowrap;\r\n}\r\n\r\n.tree tr td a {\r\n	font-size: 11px;\r\n	color: @@TreeColor@@;\r\n	font-family: Helvetica, Arial, Verdana;\r\n	text-decoration: none;\r\n	padding: 2px;\r\n}\r\n\r\n.tree tr td a:hover, .tree tr td a.debug-only-item:hover {\r\n	color: @@TreeHoverColor@@;\r\n}\r\n\r\n.tree tr.highlighted td a, .tree tr.highlighted td a.debug-only-item {\r\n	color: @@TreeHighColor@@;\r\n	background-color: @@TreeHighBgColor@@;\r\n}\r\n\r\n.tree tr.highlighted td a:hover {\r\n	color: @@TreeHighHoverColor@@;\r\n}\r\n\r\n.tree tr td a.debug-only-item {\r\n	color: grey;\r\n}\r\n\r\n/* Ajax Dropdown */\r\n.suggest-box {\r\n	border: 1px solid #999;\r\n	background-color: #fff;\r\n}\r\n\r\n.suggest-item, .suggest-item-over {\r\n	padding: 1px 2px 0px 2px;\r\n	font-family: arial,verdana;\r\n	font-size: 12px;\r\n}\r\n\r\n.suggest-item-over {\r\n	background-color: #3366CC;\r\n	color: #fff;\r\n}\r\n\r\n/* Dashboard Summary Boxes */\r\n.summary-box {\r\n	border: 1px solid black;\r\n	margin-bottom: 4px;\r\n}\r\n\r\n.summary-box .title {\r\n	color: white;\r\n	font-weight: bold;\r\n	padding: 6px 5px;\r\n	vertical-align: middle;\r\n	background-color: #4A92CE;\r\n	border-bottom: 1px solid black;\r\n}\r\n\r\n.summary-box .content {\r\n	padding: 4px;\r\n	background-color: #F6F6F6;\r\n}\r\n\r\n.summary-box .group {\r\n	border-bottom: 1px solid black;\r\n	margin-bottom: 10px;\r\n	padding: 0 0 10px 10px;\r\n}\r\n\r\n.summary-box .group.last {\r\n	border-width: 0px;\r\n	margin-bottom: 0;\r\n	padding-bottom: 5px;\r\n}\r\n\r\n.summary-box h4 {\r\n	margin: 0;\r\n	padding: 0 0 3px 0;\r\n	font-size: 11px;\r\n	font-weight: bold;\r\n}\r\n\r\n.summary-box .hint {\r\n	font-size: 10px;\r\n	color: grey;\r\n	margin-bottom: 3px;\r\n}\r\n\r\n.summary-box .hint .cache-key {\r\n	margin-bottom: 7px;\r\n	margin-left: 3px;\r\n}\r\n\r\n.summary-box ul {\r\n	margin-top: 5px;\r\n	margin-bottom: 3px;\r\n	padding-left: 30px;\r\n}\r\n\r\n.summary-box li {\r\n	padding-bottom: 4px;\r\n}\r\n\r\nspan.cke_skin_kama {\r\n	border-width: 0px !important;\r\n	-moz-border-radius: 0px !important;\r\n	-webkit-border-radius: 0px !important;\r\n	padding: 0px !important;\r\n}\r\n\r\n.cke_wrapper{\r\n	border-width: 0px !important;\r\n	-moz-border-radius: 0px !important;\r\n	-webkit-border-radius: 0px !important;\r\n}', 'in-portal_logo_img.jpg', 'in-portal_logo_img2.jpg', 'in-portal_logo_login.gif', 'a:22:{s:11:"HeadBgColor";a:2:{s:11:"Description";s:27:"Head frame background color";s:5:"Value";s:7:"#007BF4";}s:9:"HeadColor";a:2:{s:11:"Description";s:21:"Head frame text color";s:5:"Value";s:7:"#FFFFFF";}s:14:"SectionBgColor";a:2:{s:11:"Description";s:28:"Section bar background color";s:5:"Value";s:7:"#FFFFFF";}s:12:"SectionColor";a:2:{s:11:"Description";s:22:"Section bar text color";s:5:"Value";s:7:"#2D79D6";}s:12:"HeadBarColor";a:1:{s:5:"Value";s:7:"#000000";}s:14:"HeadBarBgColor";a:1:{s:5:"Value";s:7:"#1961B8";}s:13:"TitleBarColor";a:1:{s:5:"Value";s:7:"#FFFFFF";}s:15:"TitleBarBgColor";a:1:{s:5:"Value";s:7:"#2D79D6";}s:14:"ToolbarBgColor";a:1:{s:5:"Value";s:7:"#F0F1EB";}s:14:"FiltersBgColor";a:1:{s:5:"Value";s:7:"#D7D7D7";}s:17:"ColumnTitlesColor";a:1:{s:5:"Value";s:7:"#FFFFFF";}s:19:"ColumnTitlesBgColor";a:1:{s:5:"Value";s:7:"#999999";}s:8:"OddColor";a:1:{s:5:"Value";s:7:"#000000";}s:10:"OddBgColor";a:1:{s:5:"Value";s:7:"#F6F6F6";}s:9:"EvenColor";a:1:{s:5:"Value";s:7:"#000000";}s:11:"EvenBgColor";a:1:{s:5:"Value";s:7:"#EBEBEB";}s:9:"TreeColor";a:1:{s:5:"Value";s:7:"#000000";}s:14:"TreeHoverColor";a:1:{s:5:"Value";s:7:"#009FF0";}s:13:"TreeHighColor";a:1:{s:5:"Value";s:7:"#FFFFFF";}s:18:"TreeHighHoverColor";a:1:{s:5:"Value";s:7:"#FFFFFF";}s:15:"TreeHighBgColor";a:1:{s:5:"Value";s:7:"#4A92CE";}s:11:"TreeBgColor";a:1:{s:5:"Value";s:7:"#DCECF6";}}', 1375200926, 1, 1);
+INSERT INTO AdminSkins VALUES(DEFAULT, 'Default', '/* General elements */\r\n\r\nhtml {\r\n	height: 100%;\r\n}\r\n\r\nbody {\r\n 	font-family: verdana,arial,helvetica,sans-serif;\r\n 	color: #000000;\r\n	overflow-x: auto; overflow-y: auto;\r\n	margin: 0px 0px 0px 0px;\r\n	text-decoration: none;\r\n}\r\n\r\nbody, td {\r\n	/* fix for Firefox, when font-size was not inherited in table cells */\r\n	font-size: 9pt;\r\n}\r\n\r\na {\r\n	color: #006699;\r\n	text-decoration: none;\r\n}\r\n\r\na:hover {\r\n	color: #009ff0;\r\n	text-decoration: none;\r\n}\r\n\r\nform {\r\n   display: inline;\r\n}\r\n\r\nimg { border: 0px; }\r\n\r\nbody.height-100 {\r\n	height: 100%;\r\n}\r\n\r\nbody.regular-body {\r\n	margin: 0px 10px 5px 10px;\r\n	color: #000000;\r\n	background-color: @@SectionBgColor@@;\r\n}\r\n\r\nbody.edit-popup {\r\n	margin: 0px 0px 0px 0px;\r\n}\r\n\r\ntable.collapsed {\r\n	border-collapse: collapse;\r\n}\r\n\r\n.bordered, table.bordered, .bordered-no-bottom {\r\n	border: 1px solid #000000 !important;\r\n	border-top-width: 0px;\r\n	border-collapse: collapse;\r\n}\r\n\r\n.bordered-no-bottom {\r\n	border-top-width: 1px;\r\n	border-bottom: none;\r\n}\r\n\r\n.login-table td {\r\n	padding: 1px;\r\n}\r\n\r\n.disabled {\r\n	background-color: #ebebeb;\r\n}\r\n\r\n/* Head frame */\r\ntable.head-table {\r\n	background: url(\'@@base_url@@/core/admin_templates/img/top_frame/right_background.png\') top right @@HeadBgColor@@ no-repeat;\r\n}\r\n\r\n.head-table tr td, .head-table tr td a {\r\n	color: @@HeadColor@@\r\n}\r\n\r\ndiv#extra_toolbar td.button-active {\r\n	background: url(\'@@base_url@@/core/admin_templates/img/top_frame/toolbar_button_background.gif\') bottom left repeat-x;\r\n	height: 22px;\r\n}\r\n\r\ndiv#extra_toolbar td.button-active a {\r\n	color: black;\r\n	text-decoration: none;\r\n}\r\n\r\ntd.kx-block-header, .head-table tr td.kx-block-header{\r\n	color: @@HeadBarColor@@;\r\n	background: url(\'@@base_url@@/core/admin_templates/img/top_frame/toolbar_background.gif\') repeat-x top left;\r\n	/*background-color: @@HeadBarBgColor@@;*/\r\n	padding-left: 7px;\r\n	padding-right: 7px;\r\n}\r\n\r\na.kx-header-link {\r\n	text-decoration: underline;\r\n	font-weight: bold;\r\n	color: #0080C8;\r\n}\r\n\r\na.kx-header-link:hover {\r\n	color: #FFCB05;\r\n	text-decoration: none;\r\n}\r\n\r\n.kx-secondary-foreground 	{\r\n	color: #FFFFFF;\r\n	/*background-color: @@HeadBarBgColor@@;*/\r\n}\r\n\r\n.kx-login-button {\r\n	background-color: #2D79D6;\r\n	color: #FFFFFF;\r\n}\r\n\r\n/* General form button (yellow) */\r\n.button {\r\n	font-size: 12px;\r\n	font-weight: normal;\r\n	color: #000000;\r\n	background: url(\'@@base_url@@/core/admin_templates/img/button_back.gif\') #f9eeae repeat-x;\r\n	text-decoration: none;\r\n}\r\n\r\n/* Disabled (grayed-out) form button */\r\n.button-disabled {\r\n	font-size: 12px;\r\n	font-weight: normal;\r\n	color: #676767;\r\n	background: url(\'@@base_url@@/core/admin_templates/img/button_back_disabled.gif\') #f9eeae repeat-x;\r\n	text-decoration: none;\r\n}\r\n\r\n/* Tabs bar */\r\n\r\n.tab, .tab-active {\r\n	background-color: #F0F1EB;\r\n	padding: 3px 7px 2px 7px;\r\n	border-top: 1px solid black;\r\n	border-left: 1px solid black;\r\n	border-right: 1px solid black;\r\n	margin-left: 3px !important;\r\n	white-space: nowrap;\r\n}\r\n\r\n.tab-active {\r\n	background-color: #4487D9;\r\n}\r\n\r\n.tab a {\r\n	color: #4487D9;\r\n	font-weight: bold;\r\n}\r\n\r\n.tab-active a {\r\n	color: #FFFFFF;\r\n	font-weight: bold;\r\n}\r\n\r\na.scroll-left, a.scroll-right {\r\n	cursor: pointer;\r\n	display: block;\r\n	float: left;\r\n	height: 18px;\r\n	margin: 0px 1px;\r\n	width: 18px;\r\n}\r\n\r\na.scroll-left {\r\n	background: transparent url(\'@@base_url@@/core/admin_templates/img/tabs/left.png\') no-repeat scroll 0 0;\r\n}\r\n\r\na.scroll-right {\r\n	background: transparent url(\'@@base_url@@/core/admin_templates/img/tabs/right.png\') no-repeat scroll 0 0;\r\n}\r\n\r\na.disabled {\r\n	visibility: hidden !important;\r\n}\r\n\r\na.scroll-left:hover, a.scroll-right:hover {\r\n	background-position: 0 -18px;\r\n}\r\n\r\ntd.scroll-right-container {\r\n	width: 20px;\r\n}\r\n\r\ntd.scroll-right-container.disabled, td.scroll-right-container.disabled * {\r\n	width: 0px;\r\n	margin: 0px;\r\n}\r\n\r\ntd.scroll-right-container.disabled br {\r\n	display: none;\r\n}\r\n\r\n/* Toolbar */\r\n\r\n.toolbar {\r\n	font-size: 8pt;\r\n	border: 1px solid #000000;\r\n	border-width: 0px 1px 1px 1px;\r\n	background-color: @@ToolbarBgColor@@;\r\n	border-collapse: collapse;\r\n}\r\n\r\n.toolbar td {\r\n	height: 100%;\r\n}\r\n\r\n.toolbar-button, .toolbar-button-disabled, .toolbar-button-over {\r\n	float: left;\r\n	text-align: center;\r\n	font-size: 8pt;\r\n	padding: 5px 5px 5px 5px;\r\n	vertical-align: middle;\r\n	color: #006F99;\r\n}\r\n\r\n.toolbar-button-over {\r\n	color: #000;\r\n}\r\n\r\n.toolbar-button-disabled {\r\n	color: #444;\r\n}\r\n\r\n/*  Scrollable Grids */\r\n\r\n\r\n.layout-only-table td {\r\n  border: none !important;\r\n}\r\n\r\n/* Main Grid class */\r\n.grid-scrollable {\r\n	padding: 0px;\r\n	border: 1px solid black !important;\r\n	border-top: none !important;\r\n}\r\n\r\n/* Div generated by js, which contains all the scrollable grid elements, affects the style of scrollable area without data (if there are too few rows) */\r\n.grid-container {\r\n	background-color: #fff;\r\n}\r\n\r\n.grid-container table {\r\n	border-collapse: collapse;\r\n}\r\n\r\n/* Inner div generated in each data-cell */\r\n.grid-cell-div {\r\n	overflow: hidden;\r\n	height: auto;\r\n}\r\n\r\n/* Main row definition */\r\n.grid-data-row td, .grid-data-row-selected td, .grid-data-row-even-selected td, .grid-data-row-mouseover td, .table-color1, .table-color2, .grid-edit-table .edit-form-odd > td, .grid-edit-table .edit-form-even > td {\r\n	font-weight: normal;\r\n	color: @@OddColor@@;\r\n	background-color: @@OddBgColor@@;\r\n	padding: 3px 5px 3px 5px;\r\n	overflow: hidden;\r\n	border-right: 1px solid #c9c9c9;\r\n}\r\n.grid-data-row-even td, .table-color2, .grid-edit-table .edit-form-even > td {\r\n	background-color: @@EvenBgColor@@;\r\n	color: @@EvenColor@@;\r\n}\r\n.grid-data-row td a, .grid-data-row-selected td a, .grid-data-row-mouseover td a {\r\n	text-decoration: underline;\r\n}\r\n\r\n/* mouse-over rows */\r\n.grid-data-row-mouseover td, table tr.grid-data-row[_row_highlighted] td {\r\n	background: #FFFDF4;\r\n}\r\n\r\n/* Selected row, applies to both checkbox and data areas */\r\n.grid-data-row-selected td, table tr.grid-data-row[_row_selected] td {\r\n	background: #FEF2D6;\r\n}\r\n\r\n.grid-data-row-even-selected td, .grid-data-row-even[_row_selected] td {\r\n	background: #FFF7E0;\r\n}\r\n\r\n/* General header cell definition */\r\n.grid-header-row td {\r\n	font-weight: bold;\r\n	background-color: @@ColumnTitlesBgColor@@;\r\n	text-decoration: none;\r\n	padding: 3px 5px 3px 5px;\r\n	color: @@ColumnTitlesColor@@;\r\n	border-right: none;\r\n	text-align: left;\r\n	vertical-align: middle !important;\r\n	white-space: nowrap;\r\n	border-right: 1px solid #777;\r\n}\r\n\r\n/* Filters row */\r\ntr.grid-header-row-1 td {\r\n	background-color: @@FiltersBgColor@@;\r\n	border-bottom: 1px solid black;\r\n}\r\n\r\n/* Grid Filters */\r\ntable.range-filter {\r\n	width: 100%;\r\n}\r\n\r\n.range-filter td {\r\n	padding: 0px 0px 2px 2px !important;\r\n	border: none !important;\r\n	font-size: 8pt !important;\r\n	font-weight: normal !important;\r\n	text-align: left;\r\n	color: #000000 !important;\r\n}\r\n\r\ninput.filter, select.filter, input.filter-active, select.filter-active {\r\n	margin-bottom: 0px;\r\n	border: 1px solid #aaa;\r\n}\r\n\r\ninput.filter-active {\r\n  background-color: #FFFF00;\r\n}\r\n\r\nselect.filter-active {\r\n background-color: #FFFF00;\r\n}\r\n\r\ndiv.filter, div.filter-active {\r\n	background-color: white;\r\n	border: 1px solid #AAAAAA;\r\n	color: black;\r\n	font-weight: normal;\r\n	padding: 3px;\r\n}\r\n\r\ndiv.filter-active {\r\n	background-color: #FFFF00;\r\n}\r\n\r\ndiv.multioptions_filter {\r\n	position: absolute;\r\n	z-index: 100;\r\n	color: black;\r\n	background-color: white;\r\n	border: 1px solid black;\r\n	padding: 3px 5px;\r\n	display: none;\r\n	vertical-align: middle;\r\n}\r\n\r\n/* Column titles row */\r\ntr.grid-header-row-0 td {\r\n	height: 25px;\r\n	font-weight: bold;\r\n	background-color: @@ColumnTitlesBgColor@@;\r\n	color: @@ColumnTitlesColor@@;\r\n	border-bottom: 1px solid black;\r\n}\r\n\r\ntr.grid-header-row-0 td a {\r\n	color: @@ColumnTitlesColor@@;\r\n}\r\n\r\ntr.grid-header-row-0 td a:hover {\r\n	color: #FFCC00;\r\n}\r\n\r\n\r\n.grid-footer-row td {\r\n	background-color: #D7D7D7;\r\n	font-weight: bold;\r\n	border-right: 1px solid #C9C9C9;\r\n	padding: 3px 5px 3px 5px;\r\n}\r\n\r\ntd.grid-header-last-cell, td.grid-data-last-cell, td.grid-footer-last-cell {\r\n	border-right: none !important;\r\n}\r\n\r\ntd.grid-data-col-0, td.grid-data-col-0 div {\r\n	text-align: center;\r\n	vertical-align: middle !important;\r\n}\r\n\r\ntr.grid-header-row-1 td.grid-header-col-1 {\r\n	text-align: center;\r\n	vertical-align: middle !important;\r\n}\r\n\r\ntr.grid-header-row-1 td.grid-header-col-1 div {\r\n	display: table-cell;\r\n	vertical-align: middle;\r\n}\r\n\r\n.grid-status-bar {\r\n	border: 1px solid black;\r\n	border-top: none;\r\n	padding: 0px;\r\n	width: 100%;\r\n	border-collapse: collapse;\r\n	height: 30px;\r\n}\r\n\r\n.grid-status-bar td {\r\n	background-color: @@TitleBarBgColor@@;\r\n	color: @@TitleBarColor@@;\r\n	font-size: 11pt;\r\n	font-weight: normal;\r\n	padding: 2px 8px 2px 8px;\r\n}\r\n\r\n/*  /Scrollable Grids */\r\n\r\n\r\n/* Forms */\r\ntable.edit-form {\r\n	border: none;\r\n	border-top-width: 0px !important;\r\n	border-collapse: collapse;\r\n	width: 100%;\r\n}\r\n\r\n.edit-form-odd, .edit-form-even {\r\n	padding: 0px;\r\n}\r\n\r\n.subsectiontitle {\r\n	font-size: 10pt;\r\n	font-weight: bold;\r\n	background-color: #4A92CE;\r\n	color: #fff;\r\n	height: 25px;\r\n	border-top: 1px solid black;\r\n	vertical-align: middle;\r\n}\r\n\r\n/* remove top-border from first sub-section element */\r\ntable.edit-form .subsectiontitle:first-child, table.bordered .subsectiontitle:first-child {\r\n	border-top-width: 0;\r\n}\r\n\r\n.subsectiontitle td {\r\n	vertical-align: middle;\r\n	/*padding: 3px 5px 3px 5px;*/\r\n	padding: 1px 5px;\r\n}\r\n\r\n.label-cell {\r\n	background: #DEE7F6 url(\'@@base_url@@/core/admin_templates/img/bgr_input_name_line.gif\') no-repeat right bottom;\r\n  font: 12px arial, sans-serif;\r\n  padding: 4px 20px;\r\n  width: 160px;\r\n}\r\n\r\n.control-mid {\r\n	width: 13px;\r\n	border-left: 1px solid #7A95C2;\r\n	background: #fff url(\'@@base_url@@/core/admin_templates/img/bgr_mid.gif\') repeat-x left bottom;\r\n}\r\n\r\n.control-cell {\r\n	font: 11px arial, sans-serif;\r\n	padding: 4px 10px 5px 5px;\r\n	background: #fff url(\'@@base_url@@/core/admin_templates/img/bgr_input_line.gif\') no-repeat left bottom;\r\n	width: auto;\r\n	vertical-align: middle;\r\n}\r\n\r\n.CodeMirror {\r\n	font-size: 13px;\r\n	border: 1px solid black;\r\n}\r\n\r\n.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}\r\n.CodeMirror-activeline-background {background: #e8f2ff !important;}\r\n\r\n.label-cell-filler {\r\n	background: #DEE7F6 none;\r\n}\r\n.control-mid-filler {\r\n	background: #fff none;\r\n	border-left: 1px solid #7A95C2;\r\n}\r\n.control-cell-filler {\r\n	background: #fff none;\r\n}\r\n\r\n.highlight-area, .code-highlight-area {\r\n	border: 1px solid black;\r\n	padding: 8px;\r\n	font-family: monospace !important;\r\n	font-size: 12px;\r\n	overflow: auto;\r\n}\r\n\r\n.code-highlight-area {\r\n	background-color: #F6F6F6;\r\n}\r\n\r\n.error {\r\n	color: red;\r\n}\r\n.error-cell {\r\n	color: red;\r\n}\r\n\r\n.field-required {\r\n	color: red;\r\n}\r\n\r\n.warning-table {\r\n	background-color: #F0F1EB;\r\n	border: 1px solid #000000;\r\n	border-collapse: collapse;\r\n	border-top-width: 0px;\r\n}\r\n\r\n.form-notice, .form-warning {\r\n	font-size: 11px;\r\n}\r\n\r\n.form-warning {\r\n	color: red;\r\n}\r\n\r\n.form-notice {\r\n	color: green;\r\n}\r\n\r\n.priority {\r\n	color: red;\r\n	padding-left: 1px;\r\n	padding-right: 1px;\r\n	font-size: 11px;\r\n}\r\n\r\n.small-statistics {\r\n	font-size: 11px;\r\n	color: #707070;\r\n}\r\n\r\n.req-note {\r\n	font-style: italic;\r\n	color: #333;\r\n}\r\n\r\n#scroll_container table.tableborder {\r\n	border-collapse: separate\r\n}\r\n\r\nlabel.checkbox {\r\n	white-space: nowrap;\r\n}\r\n\r\n/* Uploader */\r\n.uploader-queue div.file {\r\n	font-size: 11px;\r\n	border: 1px solid #7F99C5;\r\n	padding: 3px;\r\n	background-color: #DEE7F6;\r\n	margin-bottom: 2px;\r\n}\r\n\r\n.uploader-queue .left  {\r\n	float: left;\r\n	vertical-align: top;\r\n}\r\n\r\n.uploader-queue .file-label {\r\n	margin-left: 5px;\r\n}\r\n\r\n.uploader-queue .preview .delete-checkbox {\r\n	margin-top: -3px;\r\n}\r\n\r\n.uploader-queue .progress-container {\r\n	margin: 2px 5px 0px 5px;\r\n}\r\n\r\n.uploader-queue .progress-empty {\r\n	width: 150px;\r\n	height: 9px;\r\n	border: 1px solid black;\r\n	background: url(\'@@base_url@@/core/admin_templates/img/progress_left.gif\') repeat-x;\r\n}\r\n\r\n.uploader-queue .progress-full {\r\n	height: 9px;\r\n	background: url(\'@@base_url@@/core/admin_templates/img/progress_done.gif\');\r\n}\r\n\r\n.uploader-queue .thumbnail {\r\n	/*margin-bottom: 2px;*/\r\n	border: 1px solid black;\r\n	background-color: grey;\r\n}\r\n\r\n/* To be sorted */\r\nspan#category_path, span#category_path a {\r\n	color: #FFFFFF;\r\n}\r\n\r\nspan#category_path a {\r\n	text-decoration: underline;\r\n}\r\n\r\n/* Section title, right to the big icon */\r\n.admintitle {\r\n	font-size: 16pt;\r\n	font-weight: bold;\r\n	color: @@SectionColor@@;\r\n	text-decoration: none;\r\n}\r\n\r\n/* Page header (bluebar) */\r\n.page-title td {\r\n	background-color: @@TitleBarBgColor@@;\r\n	color: @@TitleBarColor@@;\r\n	font-size: 11pt;\r\n	font-weight: normal;\r\n	padding: 2px 8px 2px 8px;\r\n}\r\n\r\n/* Right side of bluebar */\r\n.tablenav, tablenav a {\r\n	font-size: 11pt;\r\n	font-weight: bold;\r\n	color: @@TitleBarColor@@;\r\n\r\n	text-decoration: none;\r\n	background-color: @@TitleBarBgColor@@;\r\n	background-image: none;\r\n}\r\n\r\n/* Section title in the bluebar * -- why \'link\'? :S */\r\n.tablenav_link {\r\n	font-size: 11pt;\r\n	font-weight: bold;\r\n	color: @@TitleBarColor@@;\r\n	text-decoration: none;\r\n}\r\n\r\n/* Active page in top and bottom bluebars pagination */\r\n.current_page {\r\n	font-size: 10pt;\r\n	font-weight: bold;\r\n	background-color: #fff;\r\n	color: #2D79D6;\r\n	padding: 3px 2px 3px 3px;\r\n}\r\n\r\n/* Other pages and arrows in pagination on blue */\r\n.nav_url {\r\n	font-size: 10pt;\r\n	font-weight: bold;\r\n	color: #fff;\r\n	padding: 3px 2px 3px 3px;\r\n}\r\n\r\n/* Tree */\r\n.tree-body {\r\n	background-color: @@TreeBgColor@@;\r\n	height: 100%\r\n}\r\n\r\n.tree_head.td, .tree_head, .tree_head:hover {\r\n font-weight: bold;\r\n font-size: 10px;\r\n color: #FFFFFF;\r\n font-family: Verdana, Arial;\r\n text-decoration: none;\r\n}\r\n\r\n.tree {\r\n	padding: 0px;\r\n	border: none;\r\n	border-collapse: collapse;\r\n}\r\n\r\n.tree tr td {\r\n	padding: 0px;\r\n	margin: 0px;\r\n	font-family: helvetica, arial, verdana,;\r\n	font-size: 11px;\r\n	white-space: nowrap;\r\n}\r\n\r\n.tree tr td a {\r\n	font-size: 11px;\r\n	color: @@TreeColor@@;\r\n	font-family: Helvetica, Arial, Verdana;\r\n	text-decoration: none;\r\n	padding: 2px;\r\n}\r\n\r\n.tree tr td a:hover, .tree tr td a.debug-only-item:hover {\r\n	color: @@TreeHoverColor@@;\r\n}\r\n\r\n.tree tr.highlighted td a, .tree tr.highlighted td a.debug-only-item {\r\n	color: @@TreeHighColor@@;\r\n	background-color: @@TreeHighBgColor@@;\r\n}\r\n\r\n.tree tr.highlighted td a:hover {\r\n	color: @@TreeHighHoverColor@@;\r\n}\r\n\r\n.tree tr td a.debug-only-item {\r\n	color: grey;\r\n}\r\n\r\n/* Ajax Dropdown */\r\n.suggest-box {\r\n	border: 1px solid #999;\r\n	background-color: #fff;\r\n}\r\n\r\n.suggest-item, .suggest-item-over {\r\n	padding: 1px 2px 0px 2px;\r\n	font-family: arial,verdana;\r\n	font-size: 12px;\r\n}\r\n\r\n.suggest-item-over {\r\n	background-color: #3366CC;\r\n	color: #fff;\r\n}\r\n\r\n/* Dashboard Summary Boxes */\r\n.summary-box {\r\n	border: 1px solid black;\r\n	margin-bottom: 4px;\r\n}\r\n\r\n.summary-box .title {\r\n	color: white;\r\n	font-weight: bold;\r\n	padding: 6px 5px;\r\n	vertical-align: middle;\r\n	background-color: #4A92CE;\r\n	border-bottom: 1px solid black;\r\n}\r\n\r\n.summary-box .content {\r\n	padding: 4px;\r\n	background-color: #F6F6F6;\r\n}\r\n\r\n.summary-box .group {\r\n	border-bottom: 1px solid black;\r\n	margin-bottom: 10px;\r\n	padding: 0 0 10px 10px;\r\n}\r\n\r\n.summary-box .group.last {\r\n	border-width: 0px;\r\n	margin-bottom: 0;\r\n	padding-bottom: 5px;\r\n}\r\n\r\n.summary-box h4 {\r\n	margin: 0;\r\n	padding: 0 0 3px 0;\r\n	font-size: 11px;\r\n	font-weight: bold;\r\n}\r\n\r\n.summary-box .hint {\r\n	font-size: 10px;\r\n	color: grey;\r\n	margin-bottom: 3px;\r\n}\r\n\r\n.summary-box .hint .cache-key {\r\n	margin-bottom: 7px;\r\n	margin-left: 3px;\r\n}\r\n\r\n.summary-box ul {\r\n	margin-top: 5px;\r\n	margin-bottom: 3px;\r\n	padding-left: 30px;\r\n}\r\n\r\n.summary-box li {\r\n	padding-bottom: 4px;\r\n}\r\n\r\nspan.cke_skin_kama {\r\n	border-width: 0px !important;\r\n	-moz-border-radius: 0px !important;\r\n	-webkit-border-radius: 0px !important;\r\n	padding: 0px !important;\r\n}\r\n\r\n.cke_wrapper{\r\n	border-width: 0px !important;\r\n	-moz-border-radius: 0px !important;\r\n	-webkit-border-radius: 0px !important;\r\n}\r\n', 'in-portal_logo_img.jpg', 'in-portal_logo_img2.jpg', 'in-portal_logo_login.gif', 'a:22:{s:11:"HeadBgColor";a:2:{s:11:"Description";s:27:"Head frame background color";s:5:"Value";s:7:"#007BF4";}s:9:"HeadColor";a:2:{s:11:"Description";s:21:"Head frame text color";s:5:"Value";s:7:"#FFFFFF";}s:14:"SectionBgColor";a:2:{s:11:"Description";s:28:"Section bar background color";s:5:"Value";s:7:"#FFFFFF";}s:12:"SectionColor";a:2:{s:11:"Description";s:22:"Section bar text color";s:5:"Value";s:7:"#2D79D6";}s:12:"HeadBarColor";a:1:{s:5:"Value";s:7:"#000000";}s:14:"HeadBarBgColor";a:1:{s:5:"Value";s:7:"#1961B8";}s:13:"TitleBarColor";a:1:{s:5:"Value";s:7:"#FFFFFF";}s:15:"TitleBarBgColor";a:1:{s:5:"Value";s:7:"#2D79D6";}s:14:"ToolbarBgColor";a:1:{s:5:"Value";s:7:"#F0F1EB";}s:14:"FiltersBgColor";a:1:{s:5:"Value";s:7:"#D7D7D7";}s:17:"ColumnTitlesColor";a:1:{s:5:"Value";s:7:"#FFFFFF";}s:19:"ColumnTitlesBgColor";a:1:{s:5:"Value";s:7:"#999999";}s:8:"OddColor";a:1:{s:5:"Value";s:7:"#000000";}s:10:"OddBgColor";a:1:{s:5:"Value";s:7:"#F6F6F6";}s:9:"EvenColor";a:1:{s:5:"Value";s:7:"#000000";}s:11:"EvenBgColor";a:1:{s:5:"Value";s:7:"#EBEBEB";}s:9:"TreeColor";a:1:{s:5:"Value";s:7:"#000000";}s:14:"TreeHoverColor";a:1:{s:5:"Value";s:7:"#009FF0";}s:13:"TreeHighColor";a:1:{s:5:"Value";s:7:"#FFFFFF";}s:18:"TreeHighHoverColor";a:1:{s:5:"Value";s:7:"#FFFFFF";}s:15:"TreeHighBgColor";a:1:{s:5:"Value";s:7:"#4A92CE";}s:11:"TreeBgColor";a:1:{s:5:"Value";s:7:"#DCECF6";}}', 1482759870, 1, 1);
 
 INSERT INTO LocalesList VALUES
 (1, '0x0436', 'Afrikaans (South Africa)', 'af-ZA', 'Latn', '1252'),
Index: branches/5.3.x/core/units/helpers/col_picker_helper.php
===================================================================
diff -u -N -r15943 -r16503
--- branches/5.3.x/core/units/helpers/col_picker_helper.php	(.../col_picker_helper.php)	(revision 15943)
+++ branches/5.3.x/core/units/helpers/col_picker_helper.php	(.../col_picker_helper.php)	(revision 16503)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: col_picker_helper.php 15943 2013-08-21 15:16:40Z alex $
+* @version	$Id: col_picker_helper.php 16503 2016-12-26 18:16:21Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -346,8 +346,8 @@
 	protected function fixColumnName($name)
 	{
 		if ( in_array($name, $this->formatterRenamed) ) {
-			// remove language prefix from field, because formatter renamed column
-			$column_name = preg_replace('/^l[\d]+_/', '', $name);
+			// Remove language prefix from field, because formatter renamed column.
+			$name = preg_replace('/^l[\d]+_/', '', $name);
 		}
 
 		return $name;
Index: branches/5.3.x/core/kernel/db/dblist.php
===================================================================
diff -u -N -r16395 -r16503
--- branches/5.3.x/core/kernel/db/dblist.php	(.../dblist.php)	(revision 16395)
+++ branches/5.3.x/core/kernel/db/dblist.php	(.../dblist.php)	(revision 16503)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: dblist.php 16395 2016-11-12 12:43:14Z alex $
+* @version	$Id: dblist.php 16503 2016-12-26 18:16:21Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -454,6 +454,8 @@
 	 */
 	public function GetSelectedCount()
 	{
+		$this->Query();
+
 		return $this->SelectedCount;
 	}
 
Index: branches/5.3.x/core/admin_templates/incs/form_blocks.tpl
===================================================================
diff -u -N -r16395 -r16503
--- branches/5.3.x/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 16395)
+++ branches/5.3.x/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 16503)
@@ -851,7 +851,7 @@
 <inp2:m_DefineElement name="inp_edit_multioptions" has_empty="0" empty_value="" style="">
 	<inp2:m_RenderElement design="form_row" block_name="inp_edit_multioptions" pass_params="1">
 		<td class="control-cell">
-			<select multiple tabindex="<inp2:m_Get name='tab_index'/>" id="<inp2:{$prefix}_InputName field='$field'/>_select" onchange="update_multiple_options('<inp2:{$prefix}_InputName field='$field'/>');">
+			<select multiple tabindex="<inp2:m_Get name='tab_index'/>" id="<inp2:{$prefix}_InputName field='$field'/>_select" onchange="update_multiple_options('<inp2:{$prefix}_InputName field='$field'/>');" style="<inp2:m_Param name='style'/>">
 				<inp2:m_if check="{$prefix}_FieldOption" field="$field" option="use_phrases">
 					<inp2:{$prefix}_PredefinedOptions field="$field" block="inp_option_phrase" selected="selected" has_empty="$has_empty" empty_value="$empty_value"/>
 				<inp2:m_else/>
@@ -909,11 +909,11 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_checkbox_item">
-	<input type="checkbox" <inp2:m_param name='checked'/> id="<inp2:{$prefix}_InputName field='$field'/>_<inp2:m_param name='key'/>" value="<inp2:m_param name='key'/>" tabindex="<inp2:m_Get name='tab_index'/>" onclick="update_checkbox_options(/^<inp2:{$prefix}_InputName field='$field' as_preg='1'/>_([0-9A-Za-z-]+)/, '<inp2:{$prefix}_InputName field='$field'/>');"><label for="<inp2:{$prefix}_InputName field='$field'/>_<inp2:m_param name='key'/>"><inp2:m_param name="option"/></label><inp2:m_if check="m_Param" name="has_br"><br/><inp2:m_else/>&nbsp;</inp2:m_if>
+	<label class="checkbox" for="<inp2:{$prefix}_InputName field='$field'/>_<inp2:m_param name='key'/>"><input type="checkbox" <inp2:m_param name='checked'/> id="<inp2:{$prefix}_InputName field='$field'/>_<inp2:m_param name='key'/>" value="<inp2:m_param name='key'/>" tabindex="<inp2:m_Get name='tab_index'/>" onclick="update_checkbox_options(/^<inp2:{$prefix}_InputName field='$field' as_preg='1'/>_([0-9A-Za-z-]+)/, '<inp2:{$prefix}_InputName field='$field'/>');"><inp2:m_param name="option"/></label><inp2:m_if check="m_Param" name="has_br"><br/><inp2:m_else/>&nbsp;</inp2:m_if>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_checkbox_phrase">
-	<input type="checkbox" <inp2:m_param name='checked'/> id="<inp2:{$prefix}_InputName field='$field'/>_<inp2:m_param name='key'/>" value="<inp2:m_param name='key'/>" tabindex="<inp2:m_Get name='tab_index'/>" onclick="update_checkbox_options(/^<inp2:{$prefix}_InputName field='$field' as_preg='1'/>_([0-9A-Za-z-]+)/, '<inp2:{$prefix}_InputName field='$field'/>');"><label for="<inp2:{$prefix}_InputName field='$field'/>_<inp2:m_param name='key'/>"><inp2:m_phrase label="$option"/></label><inp2:m_if check="m_Param" name="has_br"><br/><inp2:m_else/>&nbsp;</inp2:m_if>
+	<label class="checkbox" for="<inp2:{$prefix}_InputName field='$field'/>_<inp2:m_param name='key'/>"><input type="checkbox" <inp2:m_param name='checked'/> id="<inp2:{$prefix}_InputName field='$field'/>_<inp2:m_param name='key'/>" value="<inp2:m_param name='key'/>" tabindex="<inp2:m_Get name='tab_index'/>" onclick="update_checkbox_options(/^<inp2:{$prefix}_InputName field='$field' as_preg='1'/>_([0-9A-Za-z-]+)/, '<inp2:{$prefix}_InputName field='$field'/>');"><inp2:m_phrase label="$option"/></label><inp2:m_if check="m_Param" name="has_br"><br/><inp2:m_else/>&nbsp;</inp2:m_if>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_checkboxes" no_empty="" has_br="0">
Index: branches/5.3.x/core/units/helpers/fck_helper.php
===================================================================
diff -u -N -r16382 -r16503
--- branches/5.3.x/core/units/helpers/fck_helper.php	(.../fck_helper.php)	(revision 16382)
+++ branches/5.3.x/core/units/helpers/fck_helper.php	(.../fck_helper.php)	(revision 16503)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: fck_helper.php 16382 2016-07-25 09:14:16Z alex $
+* @version	$Id: fck_helper.php 16503 2016-12-26 18:16:21Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -417,7 +417,7 @@
 			'blur' => 'function(ev) { $("body").trigger("InlineEditor.Blur", [ev]); }',
 		);
 
-		return $editor->inline($editor_name, Array (), $events);
+		return $editor->inline($editor_name, array('removePlugins' => 'codemirror'), $events);
 	}
 
 	/**
@@ -541,6 +541,12 @@
 
 			$prefix = $this->Application->isAdmin ? '_FRONT_END_' : '';
 			$styles_css = $this->Application->HREF('index', $prefix, $url_params, 'index.php');
+
+			/** @var kCurlHelper $curl_helper */
+			$curl_helper = $this->Application->recallObject('CurlHelper');
+			$curl_helper->Send($styles_css, false);
+			$styles_css = $curl_helper->getInfo(CURLINFO_REDIRECT_URL);
+			$curl_helper->CloseConnection();
 		}
 		else {
 			$stylesheet_folder_url = $this->Application->BaseURL() . trim(EDITOR_PATH, '/') . '/';
Index: branches/5.3.x/core/units/fck/fck_eh.php
===================================================================
diff -u -N -r16225 -r16503
--- branches/5.3.x/core/units/fck/fck_eh.php	(.../fck_eh.php)	(revision 16225)
+++ branches/5.3.x/core/units/fck/fck_eh.php	(.../fck_eh.php)	(revision 16503)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: fck_eh.php 16225 2015-09-01 07:51:12Z alex $
+* @version	$Id: fck_eh.php 16503 2016-12-26 18:16:21Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -243,6 +243,8 @@
 		 */
 		function OnGetsEditorStyles($event)
 		{
+			kUtil::safeDefine('DBG_SKIP_REPORTING', 1);
+
 			/** @var ThemeItem $theme */
 			$theme = $this->Application->recallObject('theme.current');
 
Index: branches/5.3.x/core/kernel/utility/temp_handler.php
===================================================================
diff -u -N -r16390 -r16503
--- branches/5.3.x/core/kernel/utility/temp_handler.php	(.../temp_handler.php)	(revision 16390)
+++ branches/5.3.x/core/kernel/utility/temp_handler.php	(.../temp_handler.php)	(revision 16503)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: temp_handler.php 16390 2016-11-07 21:50:01Z alex $
+* @version	$Id: temp_handler.php 16503 2016-12-26 18:16:21Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -114,16 +114,27 @@
 		// SessionKey field is required for deleting records from expired sessions
 		$sleep_count = 0;
 		$conn = $this->_getSeparateConnection();
+		$master_ids = $this->_tables->parseTempIds($master_ids);
 
 		do {
 			// acquire lock
 			$conn->ChangeQuery('LOCK TABLES ' . TABLE_PREFIX . 'Semaphores WRITE');
 
-			$sql = 'SELECT SessionKey
+			$another_coping_active = false;
+			$sql = 'SELECT MainIDs
 					FROM ' . TABLE_PREFIX . 'Semaphores
-					WHERE (MainPrefix = ' . $conn->qstr($this->_tables->getPrefix()) . ')';
-			$another_coping_active = $conn->GetOne($sql);
+					WHERE MainPrefix = ' . $conn->qstr($this->_tables->getPrefix()) . ' AND MainIDs <> "0"';
+			$other_semaphores_main_ids = $conn->GetCol($sql);
 
+			foreach ( $other_semaphores_main_ids as $other_semaphore_main_ids ) {
+				$other_semaphore_main_ids = explode(',', $other_semaphore_main_ids);
+
+				if ( array_intersect($master_ids, $other_semaphore_main_ids) ) {
+					$another_coping_active = true;
+					break;
+				}
+			}
+
 			if ( $another_coping_active ) {
 				// another user is coping data from temp table to live -> release lock and try again after 1 second
 				$conn->ChangeQuery('UNLOCK TABLES');
@@ -145,6 +156,7 @@
 			'SessionKey' => $this->Application->GetSID(),
 			'Timestamp' => time(),
 			'MainPrefix' => $this->_tables->getPrefix(),
+			'MainIDs' => implode(',', $master_ids),
 		);
 
 		$conn->doInsert($fields_hash, TABLE_PREFIX . 'Semaphores');
@@ -1391,6 +1403,18 @@
 	}
 
 	/**
+	 * Ensures, that ids are always an array
+	 *
+	 * @param array $ids IDs.
+	 *
+	 * @return array
+	 */
+	public function parseTempIds($ids)
+	{
+		return $this->_parseTempIds($ids);
+	}
+
+	/**
 	 * Checks, that someone is editing selected records and returns true, when no one.
 	 *
 	 * @param Array $ids
Index: branches/5.3.x/core/kernel/db/cat_event_handler.php
===================================================================
diff -u -N -r16395 -r16503
--- branches/5.3.x/core/kernel/db/cat_event_handler.php	(.../cat_event_handler.php)	(revision 16395)
+++ branches/5.3.x/core/kernel/db/cat_event_handler.php	(.../cat_event_handler.php)	(revision 16503)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: cat_event_handler.php 16395 2016-11-12 12:43:14Z alex $
+* @version	$Id: cat_event_handler.php 16503 2016-12-26 18:16:21Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -2661,24 +2661,17 @@
 
 		if ( $ids ) {
 			foreach ($ids as $id) {
-				$ret = true;
 				$object->Load($id);
 
 				switch ( $event->Name ) {
 					case 'OnMassApprove':
-						$ret = $object->ApproveChanges();
+						$object->ApproveChanges();
 						break;
 
 					case 'OnMassDecline':
-						$ret = $object->DeclineChanges();
+						$object->DeclineChanges();
 						break;
 				}
-
-				if ( !$ret ) {
-					$event->status = kEvent::erFAIL;
-					$event->redirect = false;
-					break;
-				}
 			}
 		}
 
Index: branches/5.3.x/tools/clear_cache.sh
===================================================================
diff -u -N -r15902 -r16503
--- branches/5.3.x/tools/clear_cache.sh	(.../clear_cache.sh)	(revision 15902)
+++ branches/5.3.x/tools/clear_cache.sh	(.../clear_cache.sh)	(revision 16503)
@@ -1,5 +1,5 @@
 #!/bin/sh
 FULL_PATH=`cd $(dirname $0)/..; pwd`
 
-find "$FULL_PATH"/system/cache -mindepth 1 -maxdepth 1 -not -name "CVS" -not -name ".svn" -print0 | xargs -0 rm -Rf
+find "$FULL_PATH"/system/cache -mindepth 1 -maxdepth 1 -not -name "CVS" -not -name ".svn" -not -name ".gitignore" -print0 | xargs -0 rm -Rf
 rm -Rf "$FULL_PATH"/system/.restricted/debug_*.txt
Index: branches/5.3.x/core/kernel/db/db_connection.php
===================================================================
diff -u -N -r16226 -r16503
--- branches/5.3.x/core/kernel/db/db_connection.php	(.../db_connection.php)	(revision 16226)
+++ branches/5.3.x/core/kernel/db/db_connection.php	(.../db_connection.php)	(revision 16503)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: db_connection.php 16226 2015-09-01 08:21:44Z alex $
+* @version	$Id: db_connection.php 16503 2016-12-26 18:16:21Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -1089,8 +1089,20 @@
 
 			// set 2nd checkpoint: begin
 			if ( $this->_profileSQLs ) {
-				$first_cell = count($ret) == 1 && $ret->fieldCount() == 1 ? current($ret->current()) : null;
+				$current_row = $ret->current();
 
+				if ( count($ret) == 1 && $ret->fieldCount() == 1 ) {
+					if ( is_array($current_row) ) {
+						$first_cell = current($current_row);
+					}
+					else {
+						$first_cell = $current_row;
+					}
+				}
+				else {
+					$first_cell = null;
+				}
+
 				if ( strlen($first_cell) > 200 ) {
 					$first_cell = substr($first_cell, 0, 50) . ' ...';
 				}
Index: branches/5.3.x/core/kernel/nparser/ntags.php
===================================================================
diff -u -N -r16395 -r16503
--- branches/5.3.x/core/kernel/nparser/ntags.php	(.../ntags.php)	(revision 16395)
+++ branches/5.3.x/core/kernel/nparser/ntags.php	(.../ntags.php)	(revision 16503)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: ntags.php 16395 2016-11-12 12:43:14Z alex $
+* @version	$Id: ntags.php 16503 2016-12-26 18:16:21Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -402,42 +402,47 @@
 	{
 		$o = parent::Open($tag);
 
-		if ($o === false) {
+		if ( $o === false ) {
 			// some required params not passed
 			return $o;
 		}
 
+		$param_name = $tag['NP']['name'];
 		$capture_params = $tag['NP'];
-		$capture_params['name'] = '__capture_' . $tag['NP']['name'];
+		$capture_params['name'] = '__capture_' . $param_name;
 
 		$capture_to_pass = $this->Parser->CompileParamsArray($capture_params);
-		$code[] = "if (isset(\$_parser->Captures['{$tag['NP']['name']}'])) {";
-		$code[] = "\${$tag['NP']['name']} = \$_parser->ParseBlock($capture_to_pass);";
+		$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[] = "}";
 		$code[] = "else {";
+
 		$to_pass = $this->Parser->CompileParamsArray($tag['NP']);
-		$code[] = '$_p_ =& $_parser->GetProcessor(\'m\');';
-		$code[] = '$_tag_params = ' . $to_pass . ';';
-		$code[] = "\${$tag['NP']['name']} = \$_p_->PostProcess(\${$tag['NP']['name']}, \$_p_->PreparePostProcess(\$_tag_params));";
+		$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[] = "}";
 
-		if (array_key_exists('result_to_var', $tag['NP']) && $tag['NP']['result_to_var']) {
-			$code[] = "\$params['{$tag['NP']['result_to_var']}'] = \$_parser->GetParam('{$tag['NP']['result_to_var']}');";
+		if ( array_key_exists('result_to_var', $tag['NP']) && $tag['NP']['result_to_var'] ) {
+			$result_to_var = $tag['NP']['result_to_var'];
+			$code[] = "\${$result_to_var} = \$_parser->GetParam('{$result_to_var}');";
 
-			if (array_key_exists('plus', $tag['NP'])) {
-				$code[] = "\$params['{$tag['NP']['result_to_var']}'] += {$tag['NP']['plus']};";
+			if ( array_key_exists('plus', $tag['NP']) ) {
+				$code[] = "\${$result_to_var} += {$tag['NP']['plus']};";
 			}
 
-			$code[] = "\${$tag['NP']['result_to_var']} = \$params['{$tag['NP']['result_to_var']}'];";
+			$code[] = "\$params['{$result_to_var}'] = \${$result_to_var};";
 		}
-		elseif (array_key_exists('plus', $tag['NP'])) {
-			$code[] = "\${$tag['NP']['name']} += {$tag['NP']['plus']};";
+		elseif ( array_key_exists('plus', $tag['NP']) ) {
+			$code[] = "\$tmp_{$param_name} += {$tag['NP']['plus']};";
 		}
 
-		$code[] = "\$params['{$tag['NP']['name']}'] = \${$tag['NP']['name']};";
-		$code[] = "echo (\${$tag['NP']['name']});";
+		$code[] = "echo (\$tmp_{$param_name});";
 
 		$this->AppendCode($o, $code);
+
 		return $o;
 	}
 }