Changeset 1788

Timestamp:

04/30/2011 03:24:46 PM (2 years ago)

Author:

BrianKoontz

Message:

Fixes broken interwiki links embedded as forced links. Refs #1053

Files:

• trunk/formatters/wakka.php (modified) (7 diffs)

trunk/formatters/wakka.php

@@ -758 +758 @@
                                 $output .= $wakka->FormOpen("grabcode");
                                 // build form
-                                $output .= '<input type="submit" class="grabcode" name="save" value="'.T_("Grab").'" title="'.rtrim(sprintf(T_("Download %s"), $valid_filename)).'" />';
+                                $output .= '<input type="submit" class="grabcode" name="save" value="'.GRABCODE_BUTTON.'" title="'.rtrim(sprintf(GRABCODE_BUTTON_TITLE, $valid_filename)).'" />';
                                 $output .= '<input type="hidden" name="filename" value="'.urlencode($valid_filename).'" />';
                                 $output .= '<input type="hidden" name="code" value="'.urlencode($code).'" />';
@@ -776 +776 @@
                                 return "";
 
-                        // Case 1: Deprecated...(first part is a URL followed by
+                        // Case 1: Interwiki link followed by | separator
+                        if(preg_match("/^([A-ZÄÖÜ][A-Za-zÄÖÜßäöü]+[:].*?)\s*\|\s*(.*?)$/s", $contents, $matches))
+                        {
+                                $url = $matches[1];
+                                $text = $matches[2];
+                        }
+
+                        // Case 2: Deprecated...(interwiki link followed by
+                        // whitespace separator)
+                        else if(preg_match("/^([A-ZÄÖÜ][A-Za-zÄÖÜßäöü]+[:]\S*)\s+(.*)$/s", $contents, $matches))
+                        {
+                                $url = $matches[1];
+                                $text = $matches[2];
+                        }
+
+                        // Case 3: Deprecated...(first part is a URL followed by
                         // one or more whitespaces)
-                        if (preg_match("/^((http|https|ftp|news|irc|gopher):\/\/([^\|\\s\"<>]+))\s+([^\|]+)$/s", $contents, $matches))          # recognize forced links across lines
+                        else if (preg_match("/^((http|https|ftp|news|irc|gopher):\/\/([^\|\\s\"<>]+))\s+([^\|]+)$/s", $contents, $matches))             # recognize forced links across lines
                         {
                                 if (!isset($matches[1])) $matches[1] = ''; #38
@@ -786 +801 @@
                         }
 
-                        // Case 2: Deprecated...(first part is a string
+                        // Case 4: Deprecated...(first part is a string
                         // followed by one or more whitespaces)
                         else if(preg_match("/^(.*?)\s+([^|]+)$/s", $contents, $matches) && 
@@ -795 +810 @@
                         }
 
-                        // Case 3: If no "|" exists in $contents, assume the match
+                        // Case 5: If no "|" exists in $contents, assume the match
                         // refers to an internal page
                         else if(preg_match("/^([^\|]+)$/s", $contents, $matches))
@@ -803 +818 @@
                         }
 
-                        // Case 4: If a "|" symbol exists, assume two parts, a URL and
+                        // Case 6: If a "|" symbol exists, assume two parts, a URL and
                         // text
                         else if(preg_match("/^(.*?)\s*\|\s*(.*?)$/s", $contents, $matches))
@@ -985 +1000 @@
                 }
                 // interwiki links!
+                // Deprecated; use forced links with | separator instead
                 elseif (preg_match("/^[A-ZÄÖÜ][A-Za-zÄÖÜßäöü]+[:]\S*$/s", $thing))
                 {
@@ -1101 +1117 @@
         # action
         "\{\{.*?\}\}|".
-        # InterWiki link
+        # InterWiki link (deprecated, as pagenames may now contain spaces)
+        # Use forced links with a | separator instead
         "\b[A-ZÄÖÜ][A-Za-zÄÖÜßäöü]+[:](?![=_])\S*\b|".
         # CamelWords