Index: trunk/kernel/admin_templates/incs/script.js
===================================================================
diff -u -r4724 -r4850
--- trunk/kernel/admin_templates/incs/script.js	(.../script.js)	(revision 4724)
+++ trunk/kernel/admin_templates/incs/script.js	(.../script.js)	(revision 4850)
@@ -356,15 +356,18 @@
 function openSelector($prefix, $url, $dst_field, $window_size, $event)
 {
 	var $kf = document.getElementById($form_name);
-	var $regex = new RegExp('(.*)\?env=' + document.getElementById('sid').value + '-(.*?):(.*)');
-	var $t = $regex.exec($url)[2];
+	var $regex = new RegExp('(.*)\?env=' + document.getElementById('sid').value + '-(.*?):(m[^:]+)');
+	$regex = $regex.exec($url);
+	
+	var $t = $regex[2];
 	var $window_name = 'select_'+$t.replace(/(\/|-)/g, '_');
+	set_hidden_field('return_m', $regex[3]);
 	
 	if (!isset($window_size)) $window_size = '750x400';
 
 	$window_size = $window_size.split('x');
 
-	if(!isset($event)) $event='';
+	if (!isset($event)) $event = '';
 	processHooks('openSelector', hBEFORE);
 
 	var $prev_action = $kf.action;
@@ -375,7 +378,7 @@
 	set_hidden_field('dst_field', $dst_field);
 	set_hidden_field('return_template', $kf.elements['t'].value); // where should return after popup is done
 
-	openwin('',$window_name,$window_size[0],$window_size[1]);
+	openwin('', $window_name, $window_size[0], $window_size[1]);
 	$kf.action = $url;
 	$kf.target = $window_name;