--- a/filters.inc	Fri May 20 13:25:53 2011 +0200
+++ b/filters.inc	Fri May 20 22:28:03 2011 +0200
@@ -6,18 +6,23 @@
 	$pattern = "/<li id=\"${name}\"\s?([^>]*)>/is";
 	$replacement = "<li id=\"${name}\" class=\"active\" $1>";
 	$output= preg_replace($pattern, $replacement, $input);
-	
+
 	$pattern = '/<li id="([^"]+)"\s?([^>]*)>(.*?)<\/li>/is';
-	$replacement = "<li id=\"\$1\" \$2><a href=\"".genUrl(array( "name" => "$1" ))."\">\$3</a></li>";
-	$output=preg_replace($pattern, $replacement, $output);
+	$replacement = "<li id=\"\$1\" \$2><a href=\"%URL-$1%\">\$3</a></li>";
+	$output=preg_replace_callback($pattern, 
+	create_function(
+	  '$matches', 
+	'return "<li id=\"$matches[1]\" $matches[2]><a href=\"".genUrl(array("name" => $matches[1]))."\">$matches[3]</a></li>";'
+	), 
+	$output);
 
 	return $output;
 }
 
-function addLangBar($input) {
+function addLangBar($input, $languages) {
 	 $name=$GLOBALS['name'];
 	 $lang=$GLOBALS['lang'];
-	 $languages = array("no","en");
+//	 $languages = array("no","en");
 	 $langbar='<ul id="language-select">';
 
 	 foreach($languages as $l) {
@@ -25,7 +30,7 @@
 	     $langbar.= "
 	    <li class=\"${l}\">";
 	    if ($active) 
-	    $langbar.='<a href="'.genUrl(array( lang => $l)).'">';
+	    $langbar.='<a href="'.genUrl(array( 'lang' => $l)).'">';
 
 	    $langbar.= "
 	      <img src=\"http://dev.bfginvest.no/php/flag.php?lang=${l}&amp;active=${active}\" width=\"20\" height=\"16\" alt=\"Norsk versjon - inaktiv\" title=\"Norsk\"/>";