Patch for function wfSajaxSearchArticleFCKeditor

[Tobias Manthey]

The function searches by default only the NS_MAIN namespace. It does not extract the namespace from search term and thus does not find articles that are not located in NS_MAIN.

The below code adds this functionality:

---

function wfSajaxSearchArticleFCKeditor( $term ) {

global $wgContLang, $wgOut,$wgExtraNamespaces;

$limit = 10;

$ns = NS_MAIN;

$term = $wgContLang->checkTitleEncoding( $wgContLang->recodeInput( js_unescape( $term ) ) );

if (strpos($term, "Category:") === 0) {

$ns = NS_CATEGORY; $term = substr($term, 9); $prefix = "Category:";

} else if (strpos($term, ":Category:") === 0) {

$ns = NS_CATEGORY; $term = substr($term, 10); $prefix = ":Category:";

} else if (strpos($term,":")) {

$pos = strpos($term,":"); $find_ns = array_search(substr($term,0,$pos),$wgExtraNamespaces); if ($find_ns) {

$ns = $find_ns; $prefix = substr($term,0,$pos+1); $term = substr($term,$pos+1);

}

}

---

[Tobias Manthey]

The function searches by default only the NS_MAIN namespace. It does not extract the namespace from search term and thus does not find articles that are not located in NS_MAIN. Addititionally the functionality to add Media: and :Image: links was added.

The below code adds this functionality:

---

function wfSajaxSearchArticleFCKeditor( $term ) {

global $wgContLang, $wgOut,$wgExtraNamespaces; $limit = 10; $ns = NS_MAIN;

$term = $wgContLang->checkTitleEncoding( $wgContLang->recodeInput( js_unescape( $term ) ) );

if (strpos($term, "Category:") === 0) {

$ns = NS_CATEGORY; $term = substr($term, 9); $prefix = "Category:";

} else if (strpos($term, ":Category:") === 0) {

$ns = NS_CATEGORY; $term = substr($term, 10); $prefix = ":Category:";

} else if (strpos($term, "Media:") === 0) {

$ns = NS_IMAGE; $term = substr($term, 6); $prefix = "Media:";

} else if (strpos($term, ":Image:") === 0) {

$ns = NS_IMAGE; $term = substr($term, 7); $prefix = ":Image:";

} else if (strpos($term,":")) {

$pos = strpos($term,":"); $find_ns = array_search(substr($term,0,$pos),$wgExtraNamespaces); if ($find_ns) {

$ns = $find_ns; $prefix = substr($term,0,$pos+1); $term = substr($term,$pos+1);

}

}

---

[Wiktor Walc]

There is an error when there is no extra namespace defined in $wgExtraNamespaces.

Additional check must be performed when this condition returns true:

else if (strpos($term,":")) {

I mean something like

is_array($wgExtraNamespaces)

[Wiktor Walc]

When I search for:

:Image:Monz

I get valid results, so it generally works, but when I select one of the links to images, I get:

[[:Image:Monza_3.gif|rtecolonImage:Monza_3.gif]]

("rtecolon" is added)

[Wiktor Walc]

Rerolled patch against head

[Wiktor Walc]

The old patch did't work with the current trunk so I have manually applied all changes. It seems that it works (tested on 1.13.5 and 1.14.0).

Committed with [3185].