--- trunk2/out/js/highlight.js	2004/07/21 23:39:10	395
+++ trunk2/out/js/highlight.js	2004/07/22 19:00:27	396
@@ -17,23 +17,32 @@
 
 function init_google(){
 	var pattern = /query=/i;
-	if (pattern.exec(document.referrer) != null){
+	var url_args;
+
+	//alert("referer: "+document.referrer+" location.search: "+location.search.substring(1));
+
+	if (pattern.exec(document.referrer) != null) {
 		var url_parts = document.referrer.split('?');
-		if (url_parts[1]){ 
-			var url_args = url_parts[1].split('&');
-			for(var i=0; i<url_args.length; i++){
-				var keyval = url_args[i].split('=');
-				if (keyval[0] == 'query'){
-					go_google(decode_url(keyval[1]));
-					return;
-				}
+		if (url_parts[1]) url_args = url_parts[1];
+	} else if (pattern.exec(location.search.substring(1)) != null) {
+		url_args = location.search.substring(1);
+		alert(url_args);
+	}
+		
+	if (url_args){ 
+		var url_args = url_args.split('&');
+		for(var i=0; i<url_args.length; i++){
+			var keyval = url_args[i].split('=');
+			if (keyval[0] == 'query'){
+				go_google(decode_url(keyval[1]));
+				return;
 			}
 		}
 	}
 }
 
 function decode_url(url){
-	return unescape(url.replace(/\+/g,' '));
+	return l2_unescape(url.replace(/\+/g,' '));
 }
 
 function go_google(terms){