Index: branches/5.3.x/core/units/helpers/country_states_helper.php
===================================================================
diff -u -N -r16195 -r16391
--- branches/5.3.x/core/units/helpers/country_states_helper.php	(.../country_states_helper.php)	(revision 16195)
+++ branches/5.3.x/core/units/helpers/country_states_helper.php	(.../country_states_helper.php)	(revision 16391)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: country_states_helper.php 16195 2015-05-19 15:58:57Z alex $
+* @version	$Id: country_states_helper.php 16391 2016-11-08 12:32:55Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -91,8 +91,8 @@
 			$country_iso = $object->GetDBField($country_field);
 
 			if ( !$country_iso ) {
-					return;
-				}
+				return;
+			}
 
 			$field_options = $object->GetFieldOptions($state_field);
 			$field_options['options'] = $this->getStates($country_iso);
Index: branches/5.3.x/core/units/helpers/upload_helper.php
===================================================================
diff -u -N -r16252 -r16391
--- branches/5.3.x/core/units/helpers/upload_helper.php	(.../upload_helper.php)	(revision 16252)
+++ branches/5.3.x/core/units/helpers/upload_helper.php	(.../upload_helper.php)	(revision 16391)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: upload_helper.php 16252 2015-09-27 06:34:45Z alex $
+* @version	$Id: upload_helper.php 16391 2016-11-08 12:32:55Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2012 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -61,7 +61,7 @@
 			throw new kUploaderException('File size exceeds allowed limit.', 413);
 		}
 
-		$value = $this->Application->HttpQuery->unescapeRequestVariable($value);
+		$value = $this->Application->unescapeRequestVariable($value);
 
 		$tmp_path = WRITEABLE . '/tmp/';
 		$filename = $this->getUploadedFilename() . '.tmp';