Index: trunk/kernel/admin_templates/incs/script.js
===================================================================
diff -u -N -r5494 -r6428
--- trunk/kernel/admin_templates/incs/script.js	(.../script.js)	(revision 5494)
+++ trunk/kernel/admin_templates/incs/script.js	(.../script.js)	(revision 6428)
@@ -310,13 +310,13 @@
 function openSelector($prefix, $url, $dst_field, $window_size, $event)
 {
 	var $kf = document.getElementById($form_name);
-	var $regex = new RegExp('(.*)\?env=' + document.getElementById('sid').value + '-(.*?):(m[^:]+)');
+	var $regex = new RegExp('(.*)\?env=(' + document.getElementById('sid').value + ')?-(.*?):(m[^:]+)');
 	$regex = $regex.exec($url);
-	
-	var $t = $regex[2];
+
+	var $t = $regex[3];
 	var $window_name = 'select_'+$t.replace(/(\/|-)/g, '_');
-	set_hidden_field('return_m', $regex[3]);
-	
+	set_hidden_field('return_m', $regex[4]);
+
 	if (!isset($window_size)) $window_size = '750x400';
 
 	$window_size = $window_size.split('x');
@@ -335,7 +335,7 @@
 	openwin('', $window_name, $window_size[0], $window_size[1]);
 	$kf.action = $url;
 	$kf.target = $window_name;
-	
+
 	submit_event($prefix, $event, $t);
 
 	processHooks('openSelector', hAFTER);
@@ -347,33 +347,33 @@
 {
 	var $kf = document.getElementById($form_name);
 	var $window_name = 'select_'+t.replace(/(\/|-)/g, '_');
-	var $regex = new RegExp('(.*)\?env=' + document.getElementById('sid').value + '-(.*?):(m[^:]+)');
-	
+	var $regex = new RegExp('(.*)\?env=(' + document.getElementById('sid').value + ')?-(.*?):(m[^:]+)');
+
 	$regex = $regex.exec($kf.action);
-	set_hidden_field('return_m', $regex[3]);
+	set_hidden_field('return_m', $regex[4]);
 	var $prev_opener = get_hidden_field('m_opener');
 	if (!isset(multi_line)) multi_line = 0;
 	openwin('', $window_name, 750, 400);
 	set_hidden_field('return_template', $kf.elements['t'].value); // where should return after popup is done
 	set_hidden_field('m_opener', 'p');
-	
+
 	set_hidden_field('translator_wnd_name', $window_name);
 	set_hidden_field('translator_field', field);
 	set_hidden_field('translator_t', t);
 	set_hidden_field('translator_prefixes', prefix);
 	set_hidden_field('translator_multi_line', multi_line);
 	$kf.target = $window_name;
-	
+
 	return $prev_opener;
 }
 
 function PreSaveAndOpenTranslator(prefix, field, t, multi_line)
 {
 	var $prev_opener = InitTranslator(prefix, field, t, multi_line);
-	
+
 	var split_prefix = prefix.split(',');
 	submit_event(split_prefix[0], 'OnPreSaveAndOpenTranslator');
-	
+
 	set_hidden_field('m_opener', $prev_opener);
 }
 
@@ -385,7 +385,7 @@
 
 	var split_prefix = prefix.split(',');
 	submit_event(split_prefix[0],'OnPreSaveAndOpenTranslator');
-	
+
 	set_hidden_field('m_opener', $prev_opener);
 }
 
@@ -397,8 +397,8 @@
 	set_hidden_field('trans_field', field);
 	set_hidden_field('events[trans]', 'OnLoad');
 
-	var $regex = new RegExp('(.*)\?env=' + document.getElementById('sid').value + '-(.*?):(.*)');
-	var $t = $regex.exec(url)[2];
+	var $regex = new RegExp('(.*)\?env=(' + document.getElementById('sid').value + ')?-(.*?):(.*)');
+	var $t = $regex.exec(url)[3];
 	$kf.target = wnd;
 	submit_event(prefix,'',$t,url);
 }
@@ -1019,7 +1019,7 @@
 		$dst_element.appendChild($new_element);
 		return $new_element;
 	}
-	
+
 	Math.sum = function($array) {
 		var $i = 0;
 		var $total = 0;
@@ -1029,7 +1029,7 @@
 		}
 		return $total;
 	}
-	
+
 	Math.average = function($array) {
 		return Math.sum($array) / $array.length;
 	}