Index: branches/5.2.x/core/units/helpers/filenames_helper.php
===================================================================
diff -u -N -r14244 -r14585
--- branches/5.2.x/core/units/helpers/filenames_helper.php	(.../filenames_helper.php)	(revision 14244)
+++ branches/5.2.x/core/units/helpers/filenames_helper.php	(.../filenames_helper.php)	(revision 14585)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: filenames_helper.php 14244 2011-03-16 20:53:41Z alex $
+* @version	$Id: filenames_helper.php 14585 2011-09-24 12:04:17Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -44,7 +44,7 @@
 
 		$this->_escapeChar = $this->Application->ConfigValue('FilenameSpecialCharReplacement');
 
-		$language =& $this->Application->recallObject('lang.current');
+		$language =& $this->Application->recallObject('lang.primary');
 		/* @var $language kDBItem */
 
 		$replacements = $language->GetDBField('FilenameReplacements');
@@ -91,54 +91,79 @@
 
 	function checkAutoFilename($table, $id_field, $item_id, $filename)
 	{
-		if(!$filename) return $filename;
+		if (!$filename) {
+			return $filename;
+		}
 
 		$item_id = !$item_id ? 0 : $item_id;
 
-		if ($table == TABLE_PREFIX.'CategoryItems') {
-			$item_categories_cur = $this->Conn->GetCol('SELECT CategoryId FROM '.$table.' WHERE ItemResourceId = '.$item_id);
-			$item_categories_live = $this->Application->IsTempTable($table) ? $this->Conn->GetCol('SELECT CategoryId FROM '.$this->Application->GetLiveName($table).' WHERE ItemResourceId = '.$item_id) : array();
+		if ( $this->Application->GetLiveName($table) == TABLE_PREFIX.'CategoryItems' ) {
+			$sql_mask = '	SELECT CategoryId
+							FROM %1$s
+							WHERE ItemResourceId = %2$s';
 
+			$item_categories_cur = $this->Conn->GetCol( sprintf($sql_mask, $table, $item_id) );
+
+			if ( $this->Application->IsTempTable($table) ) {
+				$item_categories_live = $this->Conn->GetCol( sprintf($sql_mask, $this->Application->GetLiveName($table), $item_id) );
+			}
+			else {
+				$item_categories_live = Array ();
+			}
+
 			$item_categories = array_unique(array_merge($item_categories_cur, $item_categories_live));
+
 			if (!$item_categories) {
-				$item_categories = array($this->Application->GetVar('m_cat_id')); // this may happen when creating new item
+				$item_categories = Array( $this->Application->GetVar('m_cat_id') ); // this may happen when creating new item
 			}
-			$cat_filter = ' AND CategoryId IN ('.implode(',', $item_categories).')';
+
+			$cat_filter = ' AND CategoryId IN (' . implode(',', $item_categories) . ')';
 		}
 		else {
 			$cat_filter = '';
 		}
 
 		// check current table (temp or live)
-		$sql_temp = 'SELECT '.$id_field.' FROM '.$table.' WHERE Filename = '.$this->Conn->qstr($filename).$cat_filter;
-		$found_temp_ids = $this->Conn->GetCol($sql_temp);
+		$sql_mask = '	SELECT ' . $id_field . '
+						FROM %1$s
+						WHERE Filename = ' . $this->Conn->qstr($filename) . $cat_filter;
+		$found_temp_ids = $this->Conn->GetCol( sprintf($sql_mask, $table) );
 
 		// check live table if current is temp
 		if ( $this->Application->IsTempTable($table) ) {
-			$sql_live = 'SELECT '.$id_field.' FROM '.$this->Application->GetLiveName($table).' WHERE Filename = '.$this->Conn->qstr($filename).$cat_filter;
-			$found_live_ids = $this->Conn->GetCol($sql_live);
+			$found_live_ids = $this->Conn->GetCol( sprintf($sql_mask, $this->Application->GetLiveName($table)) );
 		}
 		else {
-			$found_live_ids = array();
+			$found_live_ids = Array ();
 		}
 
 		$found_item_ids = array_unique( array_merge($found_temp_ids, $found_live_ids) );
 
 		$has_page = preg_match('/(.*)_([\d]+)([a-z]*)$/', $filename, $rets);
 
 		$duplicates_found = (count($found_item_ids) > 1) || ($found_item_ids && $found_item_ids[0] != $item_id);
-		if ($duplicates_found || $has_page) // other category has same filename as ours OR we have filename, that ends with _number
-		{
-			$append = $duplicates_found ? '_a' : '';
-			if($has_page)
-			{
+		if ($duplicates_found || $has_page) {// other category has same filename as ours OR we have filename, that ends with _number
+			$append = $duplicates_found ? $this->_escapeChar . 'a' : '';
+
+			if ($has_page) {
 				$filename = $rets[1].'_'.$rets[2];
-				$append = $rets[3] ? $rets[3] : '_a';
+				$append = $rets[3] ? $rets[3] : $this->_escapeChar . 'a';
 			}
 
 			// check live & temp table
-			$sql_cur = 'SELECT '.$id_field.' FROM '.$table.' WHERE (Filename = %s) AND ('.$id_field.' != '.$item_id.')'.$cat_filter;
-			$sql_live = $this->Application->IsTempTable($table) ? 'SELECT '.$id_field.' FROM '.$this->Application->GetLiveName($table).' WHERE (Filename = %s) AND ('.$id_field.' != '.$item_id.')'.$cat_filter : false;
+			$sql_cur = 'SELECT ' . $id_field . '
+						FROM ' . $table . '
+						WHERE (Filename = %s) AND (' . $id_field . ' != ' . $item_id . ')' . $cat_filter;
+
+			if ( $this->Application->IsTempTable($table) ) {
+				$sql_live = '	SELECT ' . $id_field . '
+								FROM ' . $this->Application->GetLiveName($table) . '
+								WHERE (Filename = %s) AND (' . $id_field . ' != ' . $item_id . ')' . $cat_filter;
+			}
+			else {
+				$sql_live = false;
+			}
+
 			while ( $this->Conn->GetOne( sprintf($sql_cur, $this->Conn->qstr($filename.$append)) ) > 0 ||
 							(	$sql_live
 								&&