Index: branches/5.1.x/core/kernel/kbase.php
===================================================================
diff -u -N -r12657 -r13086
--- branches/5.1.x/core/kernel/kbase.php	(.../kbase.php)	(revision 12657)
+++ branches/5.1.x/core/kernel/kbase.php	(.../kbase.php)	(revision 13086)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: kbase.php 12657 2009-10-04 20:07:31Z alex $
+* @version	$Id: kbase.php 13086 2010-01-12 19:47:40Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -9,7 +9,7 @@
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
-* See http://www.in-portal.net/license/ for copyright notices and details.
+* See http://www.in-portal.org/license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
@@ -132,6 +132,27 @@
 
 		}
 
+		/**
+		 * Append prefix and special to tag
+		 * params (get them from tagname) like
+		 * they were really passed as params
+		 *
+		 * @param string $prefix_special
+		 * @param Array $tag_params
+		 * @return Array
+		 * @access protected
+		 */
+		function prepareTagParams($prefix_special, $tag_params = Array())
+		{
+			$parts = explode('.', $prefix_special);
+
+			$ret = $tag_params;
+			$ret['Prefix'] = $parts[0];
+			$ret['Special'] = count($parts) > 1 ? $parts[1] : '';
+			$ret['PrefixSpecial'] = $prefix_special;
+
+			return $ret;
+		}
 	}
 
 class kDBBase extends kBase {
@@ -458,7 +479,7 @@
 	{
 		$allowed_modifiers = Array('required', 'multiple');
 
-		if ($this->Application->IsAdmin()) {
+		if ($this->Application->isAdminUser) {
 			// can change upload dir on the fly (admin only!)
 			$allowed_modifiers[] = 'upload_dir';
 		}
@@ -539,20 +560,25 @@
 	/**
 	 * Returns formatted field value
 	 *
-	 * @param string $field
+	 * @param string $name
+	 * @param string $format
+	 *
 	 * @return string
 	 * @access public
 	 */
-	function GetField($name, $format=null)
+	function GetField($name, $format = null)
 	{
 		$options = $this->GetFieldOptions($name);
-		$val = $this->GetDBField($name);
-		$res = $val;
-		if (isset($options['formatter'])) {
-			$formatter =& $this->Application->recallObject($options['formatter']);
-			$res = $formatter->Format($val, $name, $this, $format );
+
+		if (array_key_exists('formatter', $options)) {
+			$formatter_class = $options['formatter'];
+			$value = $formatter_class == 'kMultiLanguage' ? '' : $this->GetDBField($name);
+
+			$formatter =& $this->Application->recallObject($formatter_class);
+			return $formatter->Format($value, $name, $this, $format);
 		}
-		return $res;
+
+		return $this->GetDBField($name);
 	}
 
 	function HasField($name)