Skip to content

Commit 0a91255

Browse files
committed
[core:func] fix Warning error
1 parent f67dd4b commit 0a91255

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

Diff for: xoops_trust_path/modules/xpwiki/class/func/pukiwiki_func.php

+10-4
Original file line numberDiff line numberDiff line change
@@ -748,15 +748,21 @@ function autolink_pattern_write($filename, $autolink_pattern)
748748
{
749749
list($pattern, $pattern_a, $forceignorelist) = $autolink_pattern;
750750

751-
$forceignorelist_ci = array_map('strtolower', $forceignorelist);
752-
$forceignorelist_ci = array_unique($forceignorelist_ci);
751+
if (is_array($forceignorelist) && ($fi_count = count($forceignorelist))) {
752+
$forceignorelist_ci = array_map('strtolower', $forceignorelist);
753+
$forceignorelist_ci = array_unique($forceignorelist_ci);
754+
$forceignorelist_ci = array_combine($forceignorelist_ci, array_fill(0, count($forceignorelist_ci) ,true));
755+
$forceignorelist = array_combine($forceignorelist, array_fill(0, $fi_count ,true));
756+
} else {
757+
$forceignorelist = $forceignorelist_ci = array();
758+
}
753759

754760
if (! HypCommonFunc::flock_put_contents($filename,
755761
$pattern . "\n"
756762
. $pattern_a . "\n"
757763
. join("\t", $forceignorelist) . "\n"
758-
. serialize(array_combine($forceignorelist, array_fill(0, count($forceignorelist) ,true))) . "\n"
759-
. serialize(array_combine($forceignorelist_ci, array_fill(0, count($forceignorelist_ci) ,true))) . "\n"
764+
. serialize($forceignorelist) . "\n"
765+
. serialize($forceignorelist_ci) . "\n"
760766
)) {
761767
$this->die_message('Cannot write ' . $filename);
762768
}

0 commit comments

Comments
 (0)