Index: branches/5.1.x/core/units/helpers/filenames_helper.php
===================================================================
diff -u -N -r14241 -r14339
--- branches/5.1.x/core/units/helpers/filenames_helper.php	(.../filenames_helper.php)	(revision 14241)
+++ branches/5.1.x/core/units/helpers/filenames_helper.php	(.../filenames_helper.php)	(revision 14339)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: filenames_helper.php 14241 2011-03-16 20:24:35Z alex $
+* @version	$Id: filenames_helper.php 14339 2011-05-23 07:41: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');
Index: branches/5.1.x/core/units/languages/languages_event_handler.php
===================================================================
diff -u -N -r14241 -r14339
--- branches/5.1.x/core/units/languages/languages_event_handler.php	(.../languages_event_handler.php)	(revision 14241)
+++ branches/5.1.x/core/units/languages/languages_event_handler.php	(.../languages_event_handler.php)	(revision 14339)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: languages_event_handler.php 14241 2011-03-16 20:24:35Z alex $
+* @version	$Id: languages_event_handler.php 14339 2011-05-23 07:41:17Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -53,6 +53,20 @@
 		}
 
 		/**
+		 * Allows to get primary language object
+		 *
+		 * @param kEvent $event
+		 */
+		function getPassedID(&$event)
+		{
+			if ($event->Special == 'primary') {
+				return $this->Application->GetDefaultLanguageId();
+			}
+
+			return parent::getPassedID($event);
+		}
+
+		/**
 		 * [HOOK] Updates table structure on new language adding/removing language
 		 *
 		 * @param kEvent $event