[core:func] fix Warning error

nao-pon · Feb 12, 2014 · 0a91255 · 0a91255
1 parent f67dd4b
commit 0a91255
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/xoops_trust_path/modules/xpwiki/class/func/pukiwiki_func.php b/xoops_trust_path/modules/xpwiki/class/func/pukiwiki_func.php
@@ -748,15 +748,21 @@ function autolink_pattern_write($filename, $autolink_pattern)
 	{
 		list($pattern, $pattern_a, $forceignorelist) = $autolink_pattern;
 
-		$forceignorelist_ci = array_map('strtolower', $forceignorelist);
-		$forceignorelist_ci = array_unique($forceignorelist_ci);
+		if (is_array($forceignorelist) && ($fi_count = count($forceignorelist))) {
+			$forceignorelist_ci = array_map('strtolower', $forceignorelist);
+			$forceignorelist_ci = array_unique($forceignorelist_ci);
+			$forceignorelist_ci = array_combine($forceignorelist_ci, array_fill(0, count($forceignorelist_ci) ,true));
+			$forceignorelist = array_combine($forceignorelist, array_fill(0, $fi_count ,true));
+		} else {
+			$forceignorelist = $forceignorelist_ci = array();
+		}
 
 		if (! HypCommonFunc::flock_put_contents($filename,
 			  $pattern   . "\n"
 			. $pattern_a . "\n"
 			. join("\t", $forceignorelist) . "\n"
-			. serialize(array_combine($forceignorelist, array_fill(0, count($forceignorelist) ,true))) . "\n"
-			. serialize(array_combine($forceignorelist_ci, array_fill(0, count($forceignorelist_ci) ,true))) . "\n"
+			. serialize($forceignorelist) . "\n"
+			. serialize($forceignorelist_ci) . "\n"
 		)) {
 			$this->die_message('Cannot write ' . $filename);
 		}