Index: branches/5.2.x/units/gateways/gw_tag_processor.php
===================================================================
diff -u -N -r14258 -r14625
--- branches/5.2.x/units/gateways/gw_tag_processor.php	(.../gw_tag_processor.php)	(revision 14258)
+++ branches/5.2.x/units/gateways/gw_tag_processor.php	(.../gw_tag_processor.php)	(revision 14625)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: gw_tag_processor.php 14258 2011-03-16 21:43:52Z alex $
+* @version	$Id: gw_tag_processor.php 14625 2011-10-04 09:34:12Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -91,26 +91,31 @@
 		return $o;
 	}
 
-	function PredefinedOptions($params)
+	/**
+	 * Prints list a all possible field options
+	 *
+	 * @param Array $params
+	 * @return string
+	 * @access protected
+	 */
+	protected function PredefinedOptions($params)
 	{
-		$object =& $this->Application->recallObject($this->getPrefixSpecial(),$this->Prefix, $params);
+		$object =& $this->getObject($params);
+		/* @var $object kDBItem */
 
-		$value = $this->gwConfigValue($params);
-
-		$options = explode(',', $object->GetDBField('ValueList') );
-
 		$block_params = $this->prepareTagParams($params);
-
 		$block_params['name'] = $this->SelectParam($params, 'render_as,block');
 		$block_params['pass_params'] = 'true';
 
 		$o = '';
-		foreach ($options as $key_val)
-		{
-			list($key,$val) = explode('=', $key_val);
+		$value = $this->gwConfigValue($params);
+		$options = explode(',', $object->GetDBField('ValueList'));
+
+		foreach ($options as $key_val) {
+			list($key, $val) = explode('=', $key_val);
 			$block_params['key'] = $key;
 			$block_params['option'] = $val;
-			$block_params['selected'] = ( $key == $value ? ' '.$params['selected'] : '');
+			$block_params['selected'] = ($key == $value ? ' ' . $params['selected'] : '');
 			$block_params['PrefixSpecial'] = $this->getPrefixSpecial();
 			$o .= $this->Application->ParseBlock($block_params, 1);
 		}