r1371 + parseWikiLink() was completely broken. Fixed.

diff --git a/inc/functions.php b/inc/functions.php
index ec9ca93156da740c83cb06f966a36e4a4f2e826e..345d1b323732191693461ee5d34721ee52c79ca1 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -1037,14 +1037,14 @@ function findAllEndpoints ($object_id, $fallback = '')
 // (rendering <A HREF>) or O (for <OPTION>).
 function parseWikiLink ($line, $which)
 {
-       if (preg_match ('\[\[.+\]\]', $line) == 0)
+       if (preg_match ('/^\[\[.+\]\]$/', $line) == 0)
                return $line;
-       $line = preg_replace ('\[\[.+\]\]', '$1', $line);
-       $s = split ('|', $line);
+       $line = preg_replace ('/^\[\[(.+)\]\]$/', '$1', $line);
+       $s = explode ('|', $line);
        $o_value = trim ($s[0]);
        $a_value = trim ($s[1]);
        if ($which == 'a')
-               return $a_value;
+               return "<a href='${a_value}'>${o_value}</a>";
        if ($which == 'o')
                return $o_value;
 }