summaryrefslogtreecommitdiff
path: root/inc/fulltext.php
diff options
context:
space:
mode:
authorGerrit Uitslag <klapinklapin@gmail.com>2014-09-28 13:46:04 +0200
committerGerrit Uitslag <klapinklapin@gmail.com>2014-09-28 13:46:04 +0200
commitb79379f2e598abaa2febb299cdfcebe0a95d034c (patch)
tree7098c3a758f606394f4b38d679b5198f8973cffe /inc/fulltext.php
parent73411587cb6d2c54aefebe90c87799c4aa1d31ec (diff)
parentda9572711f54d13ce3c5506971154b0bc359723f (diff)
downloadrpg-b79379f2e598abaa2febb299cdfcebe0a95d034c.tar.gz
rpg-b79379f2e598abaa2febb299cdfcebe0a95d034c.tar.bz2
Merge remote-tracking branch 'origin/master' into overridablelangstrings
Conflicts: inc/plugin.php
Diffstat (limited to 'inc/fulltext.php')
-rw-r--r--inc/fulltext.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/inc/fulltext.php b/inc/fulltext.php
index dd918f214..aaef090e1 100644
--- a/inc/fulltext.php
+++ b/inc/fulltext.php
@@ -215,7 +215,7 @@ function ft_pageLookup($id, $in_ns=false, $in_title=false){
function _ft_pageLookup(&$data){
// split out original parameters
$id = $data['id'];
- if (preg_match('/(?:^| )@(\w+)/', $id, $matches)) {
+ if (preg_match('/(?:^| )(?:@|ns:)([\w:]+)/', $id, $matches)) {
$ns = cleanID($matches[1]) . ':';
$id = str_replace($matches[0], '', $id);
}