Index: branches/RC/core/units/users/users_event_handler.php
===================================================================
diff -u -r10024 -r10156
--- branches/RC/core/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 10024)
+++ branches/RC/core/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 10156)
@@ -427,6 +427,8 @@
 		 */
 		function OnAfterItemCreate(&$event)
 		{
+			$this->saveUserImages($event);
+
 			if ($this->Application->GetVar('skip_set_primary')) return;
 			$is_subscriber = $this->Application->GetVar('IsSubscriber');
 			if(!$is_subscriber)
@@ -1328,6 +1330,8 @@
 		 */
 		function OnAfterItemUpdate(&$event)
 		{
+			$this->saveUserImages($event);
+
 			$object =& $event->getObject();
 			/* @var $object UsersItem */
 
@@ -1430,6 +1434,11 @@
 				$fields['Country']['options_sql'] = preg_replace('/ORDER BY (.*)/', 'ORDER BY IF (DestId = '.$first_country.', 1, 0) DESC, \\1', $fields['Country']['options_sql']);
 				$this->Application->setUnitOption($event->Prefix, 'Fields', $fields);
 			}
+
+			$file_helper =& $this->Application->recallObject('FileHelper');
+			/* @var $file_helper FileHelper */
+
+			$file_helper->createItemFiles($event->Prefix, true); // create image fields
 		}
 
 		/**
@@ -1556,6 +1565,44 @@
 				}
 			}
 		}
+
+		/**
+		 * Loads user images
+		 *
+		 * @param kEvent $event
+		 */
+		function OnAfterItemLoad(&$event)
+		{
+			parent::OnAfterItemLoad($event);
+
+			// linking existing images for item with virtual fields
+			$image_helper =& $this->Application->recallObject('ImageHelper');
+			/* @var $image_helper ImageHelper */
+
+			$object =& $event->getObject();
+			/* @var $object kDBItem */
+
+			$image_helper->LoadItemImages($object);
+		}
+
+		/**
+		 * Save user images
+		 *
+		 * @param kEvent $event
+		 */
+		function saveUserImages(&$event)
+		{
+			if (!$this->Application->IsAdmin()) {
+				$image_helper =& $this->Application->recallObject('ImageHelper');
+				/* @var $image_helper ImageHelper */
+
+				$object =& $event->getObject();
+				/* @var $object kDBItem */
+
+				// process image upload in virtual fields
+				$image_helper->SaveItemImages($object);
+			}
+		}
 	}
 
 ?>
\ No newline at end of file