endringer fra master branch gjennomgått (ikke relatert til php7)

classes/modules/typeModule.php

@@ -123,7 +123,7 @@ class TypeModule extends abstractModule{
  	//Get the firstResults type available
   	//$typesAndValues = array('rdfs:Resource' => -1);
   	//$typesAndValues = array('rdfs__Resource' => -1);
-  	$typesAndValues = array('bibo:Document' => -1);
+  	//$typesAndValues = array('bibo:Document' => -1);
 	$typesAndValues = array('bibo__Document' => -1);
 	if(!isset($conf['disableComponents']) || $conf['disableComponents'] != true){
   	  foreach($t as $v){

lib/Haanga/lib/Haanga/Extension/Filter/Decodedescription.php

@@ -4,9 +4,7 @@ class Haanga_Extension_Filter_Decodedescription
 {
     static function main($text) {
     $allowed_tags ="<u><b><i><strong><br><p><ul><ol><li><iframe><a><img>";
-    $allowed_tags_regex= preg_replace('/\|$/','',preg_replace('/<([^>^\s]+)>/','$1|',$allowed_tags));
-    $allowed_tags_regex_strip_not_name = "/<(". $allowed_tags_regex . ")\s+[^>]+>/"; 
-    
+   
     $description= strip_tags(html_entity_decode(htmlspecialchars(html_entity_decode($text,ENT_QUOTES,"UTF-8"),ENT_QUOTES,"UTF-8"),ENT_QUOTES,"UTF-8"),$allowed_tags); 
 
     preg_match("/<p(\s[^>]*)?>/i",$description,$matches);

lib/Haanga/lib/Haanga/Extension/Filter/Timeknot.php

@@ -34,6 +34,9 @@ class Haanga_Extension_Filter_Timeknot{
   	    case 2:
   	      $variable['key'] = 'img';
   	      break;
+  	    case 3:
+  	      $variable['key'] = 'series';
+  	      break;
   	  }
   	  $fieldCounter++;
   	  array_push($varList, $variable);