Changeset 1206

Timestamp:

08/07/2008 08:24:55 AM (2 years ago)

Author:

NilsLindenberg

Message:

refs #784: fixing use of list leading to a notice

Files:

• branches/1.1.6.6/formatters/wakka.php (modified) (1 diff)

branches/1.1.6.6/formatters/wakka.php

@@ -312 +312 @@
                 else if (preg_match("/^\[\[(\S*)(\s+(.+))?\]\]$/s", $thing, $matches))          # recognize forced links across lines
                 {
-                        list (, $url, , $text) = $matches;
-                        if ($url)
+                        if (isset($matches[1])) // url?
                         {
                                 //if ($url!=($url=(preg_replace("/@@|&pound;&pound;||\[\[/","",$url))))$result="</span>";
-                                if (!$text) $text = $url;
+                                $text = '';
+                                $url = $matches[1];
+                                if (isset($matches[3])) $text = $matches[3]; // forced link title
                                 //$text=preg_replace("/@@|&pound;&pound;|\[\[/","",$text);
                                 return $result.$wakka->Link($url, "", $text);