API: fix copyright symbol, coding style cleanup, more braces

[lhc/web/wiklou.git] / includes / MagicWord.php

diff --git a/includes/MagicWord.php b/includes/MagicWord.php
index ecbdf81..d741832 100644 (file)
--- a/includes/MagicWord.php
+++ b/includes/MagicWord.php
@@ -719,11 +719,14 @@ class MagicWordArray {
                        if ( $regex === '' ) {
                                continue;
                        }
-                       preg_match( $regex, $text, $match );
-                       if ( $match ) {
-                               list( $found, $param ) = $this->parseMatch( $match );
-                               $text = substr( $text, strlen( $found ) + 1 );
-                               return $found;
+                       if ( preg_match( $regex, $text, $m ) ) {
+                               list( $id, $param ) = $this->parseMatch( $m );
+                               if ( strlen( $m[0] ) >= strlen( $text ) ) {
+                                       $text = '';
+                               } else {
+                                       $text = substr( $text, strlen( $m[0] ) );
+                               }
+                               return $id;
                        }
                }
                return false;