Merge lp:~guiona/bilboplanet/660663 into lp:~greg-theclimber/bilboplanet/testing

[Guiona]

Done

=== modified file 'inc/fonctions.php'
--- inc/fonctions.php	2010-12-03 08:08:25 +0000
+++ inc/fonctions.php	2010-12-09 08:49:52 +0000
@@ -707,12 +707,15 @@
 #---------------------------------------------------#
 function html_encode_code_tags ($html) {
 	
-	preg_match_all("/(<code>)(.*?)(<\/code>)/", $html, $matches, PREG_SET_ORDER);
-	
-	foreach ($matches as $val) {
-		$res = str_replace($val[0], "<code>".htmlentities(stripslashes($val[2]), ENT_QUOTES, 'UTF-8')."</code>", $html);
+	if (preg_match_all("/(<code>)(.*?)(<\/code>)/", $html, $matches, PREG_SET_ORDER)) {
+	
+		foreach ($matches as $val) {
+			$res = str_replace($val[0], "<code>".htmlentities(stripslashes($val[2]), ENT_QUOTES, 'UTF-8')."</code>", $html);
+		}
+	
+		return $res;
 	}
 	
-	return $res;	
+	return $html;
 }
 ?>