Index: trunk/core/units/selectors/selectors_event_handler.php
===================================================================
diff -u -r2799 -r2800
--- trunk/core/units/selectors/selectors_event_handler.php	(.../selectors_event_handler.php)	(revision 2799)
+++ trunk/core/units/selectors/selectors_event_handler.php	(.../selectors_event_handler.php)	(revision 2800)
@@ -20,6 +20,10 @@
 			$title_field = 'SelectorName';
 			$new_name = $object->GetDBField($title_field);
 			$original_checked = false;
+			
+			$foreign_key = $event->getEventParam('foreign_key'); // in case if whole stylesheet is cloned
+			if($foreign_key === false) $foreign_key = $object->GetDBField('StylesheetId'); // in case if selector is copied ifself
+			
 			do {
 				if ( preg_match('/(.*)-([\d]+)/', $new_name, $regs) ) {
 					$new_name = $regs[1].'-'.($regs[2]+1);
@@ -33,7 +37,8 @@
 				// if we are cloning live - look in live
 				$query = '	SELECT '.$title_field.' 
 							FROM '.$object->TableName.'
-							WHERE '.$title_field.' = '.$this->Conn->qstr($new_name).' AND StylesheetId = '.$object->GetDBField('StylesheetId');
+							WHERE '.$title_field.' = '.$this->Conn->qstr($new_name).' AND StylesheetId = '.$foreign_key;
+				
 				$res = $this->Conn->GetOne($query);
 				
 				/*// if not found in live table, check in temp table if applicable