429
回編集
「利用者:Nijcadmin/FY2013」の版間の差分
ナビゲーションに移動
検索に移動
→2013年5月3日（金）
細編集の要約なし |
|||
| 4行目: | 4行目: | ||
*新しいPHPのインストールを試みたがうまくいかない | *新しいPHPのインストールを試みたがうまくいかない | ||
*OS のアップデートを検討 | *OS のアップデートを検討 | ||
** | **裏で環境を整え[[テスト]]を実施して準備ができ次第連絡 | ||
**アップデート完了 | **アップデート完了 | ||
| 199行目: | 199行目: | ||
$wgExtensionFunctions[] = 'LinkTitles::setup'; | $wgExtensionFunctions[] = 'LinkTitles::setup'; | ||
</syntaxhighlight> | </syntaxhighlight> | ||
*とりあえず互換ルーチンに書き換え | *<del>とりあえず互換ルーチンに書き換え</del> | ||
** PHP 5.3 にアップデート済のため元に戻した | |||
<syntaxhighlight lang="php"> | <syntaxhighlight lang="php"> | ||
$wgExtensionFunctions[] = 'efLinkTitles_SetupHelper'; | $wgExtensionFunctions[] = 'efLinkTitles_SetupHelper'; | ||
| 205行目: | 206行目: | ||
LinkTitles::setup(); | LinkTitles::setup(); | ||
} | } | ||
</syntaxhighlight> | |||
*日本語環境対策完了 (2013/5/10) | |||
**UTF-8なページであれば WORD 境界を検索条件にしないように改造 | |||
**一文字目を抜き出す処理はマルチバイト関数を利用 | |||
<syntaxhighlight lang="php"> | |||
--- LinkTitles.body.php.orig 2013-05-03 22:26:22.000000000 +0900 | |||
+++ LinkTitles.body.php 2013-05-10 15:55:15.475792240 +0900 | |||
@@ -162,6 +162,8 @@ | |||
if ( $title != $myTitle ) { | |||
LinkTitles::$safeTitle = str_replace( '/', '\/', $title ); | |||
+ // NIJC: escape round brackets. | |||
+ LinkTitles::$safeTitle = str_replace( array('(', ')'), array('\(', '\)'), LinkTitles::$safeTitle ); | |||
// split the string by [[...]] groups | |||
// credits to inhan @ StackOverflow for suggesting preg_split | |||
@@ -173,17 +175,25 @@ | |||
// way, or in a 'fuzzy' way where the first letter of the title may | |||
// be either case. | |||
if ( $wgCapitalLinks ) { | |||
- $searchTerm = '((?i)' . LinkTitles::$safeTitle[0] . '(?-i)' . | |||
- substr(LinkTitles::$safeTitle, 1) . ')'; | |||
+ // NIJC: use multibyte functions | |||
+ $searchTerm = '((?i:' . mb_substr(LinkTitles::$safeTitle, 0, 1) . ')' . | |||
+ mb_substr(LinkTitles::$safeTitle, 1) . ')'; | |||
} else { | |||
$searchTerm = '(' . LinkTitles::$safeTitle . ')'; | |||
} | |||
for ( $i = 0; $i < count( $arr ); $i+=2 ) { | |||
// even indexes will point to text that is not enclosed by brackets | |||
+// NIJC: ignore word delimiter if search word is UTF-8 | |||
+if (mb_detect_encoding($searchTerm) == 'UTF-8') { | |||
+ $arr[$i] = preg_replace( '/(?<![\:\.\@\/\?\&])' . | |||
+ $searchTerm . '/', | |||
+ '[[$1]]', $arr[$i], $limit, $count ); | |||
+} else { | |||
$arr[$i] = preg_replace( '/(?<![\:\.\@\/\?\&])' . | |||
$wordStartDelim . $searchTerm . $wordEndDelim . '/', | |||
'[[$1]]', $arr[$i], $limit, $count ); | |||
+} | |||
if (( $limit >= 0 ) && ( $count > 0 )) { | |||
break; | |||
}; | |||
@@ -201,9 +211,16 @@ | |||
for ( $i = 0; $i < count( $arr ); $i+=2 ) { | |||
// even indexes will point to text that is not enclosed by brackets | |||
+// NIJC: ignore word delimiter if search word is UTF-8 | |||
+if (mb_detect_encoding(LinkTitles::$safeTitle) == 'UTF-8') { | |||
+ $arr[$i] = preg_replace_callback( '/(?<![\:\.\@\/\?\&])' . | |||
+ '(' . LinkTitles::$safeTitle . ')' . | |||
+ '/i', $callBack, $arr[$i], $limit, $count ); | |||
+} else { | |||
$arr[$i] = preg_replace_callback( '/(?<![\:\.\@\/\?\&])' . | |||
$wordStartDelim . '(' . LinkTitles::$safeTitle . ')' . | |||
$wordEndDelim . '/i', $callBack, $arr[$i], $limit, $count ); | |||
+} | |||
if (( $limit >= 0 ) && ( $count > 0 )) { | |||
break; | |||
}; | |||
@@ -216,7 +233,8 @@ | |||
} | |||
static function CallBackCaseInsensitive($matches) { | |||
- if ( strcmp(substr(LinkTitles::$safeTitle, 1), substr($matches[0], 1)) == 0 ) { | |||
+ // NIJC: use multibyte functions | |||
+ if ( strcmp(mb_substr(LinkTitles::$safeTitle, 1), mb_substr($matches[0], 1)) == 0 ) { | |||
return '[[' . $matches[0] . ']]'; | |||
} else { | |||
return '[[' . LinkTitles::$safeTitle . '|' . $matches[0] . ']]'; | |||
@@ -224,7 +242,8 @@ | |||
} | |||
static function CallBackCaseSensitive($matches) { | |||
- if ( strcmp(substr(LinkTitles::$safeTitle, 0), substr($matches[0], 0)) == 0 ) { | |||
+ // NIJC: use multibyte functions | |||
+ if ( strcmp(mb_substr(LinkTitles::$safeTitle, 0), mb_substr($matches[0], 0)) == 0 ) { | |||
return '[[' . $matches[0] . ']]'; | |||
} else { | |||
return '[[' . LinkTitles::$safeTitle . '|' . $matches[0] . ']]'; | |||
</syntaxhighlight> | </syntaxhighlight> | ||