Replace get{Local,Full,Link,Canonical}URL's $variant argument with a secondary $query...

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

diff --git a/includes/Sanitizer.php b/includes/Sanitizer.php
index 13ba8c1..fb38610 100644 (file)
--- a/includes/Sanitizer.php
+++ b/includes/Sanitizer.php
@@ -457,10 +457,14 @@ class Sanitizer {
                                                                # and see if we find a match below them
                                                                $optstack = array();
                                                                array_push( $optstack, $ot );
-                                                               $ot = @array_pop( $tagstack );
+                                                               wfSuppressWarnings();
+                                                               $ot = array_pop( $tagstack );
+                                                               wfRestoreWarnings();
                                                                while ( $ot != $t && isset( $htmlsingleallowed[$ot] ) ) {
                                                                        array_push( $optstack, $ot );
-                                                                       $ot = @array_pop( $tagstack );
+                                                                       wfSuppressWarnings();
+                                                                       $ot = array_pop( $tagstack );
+                                                                       wfRestoreWarnings();
                                                                }
                                                                if ( $t != $ot ) {
                                                                        # No match. Push the optional elements back again
@@ -468,7 +472,7 @@ class Sanitizer {
                                                                        wfSuppressWarnings();
                                                                        $ot = array_pop( $optstack );
                                                                        wfRestoreWarnings();
-                                                                       while ( $ot  ) {
+                                                                       while ( $ot ) {
                                                                                array_push( $tagstack, $ot );
                                                                                wfSuppressWarnings();
                                                                                $ot = array_pop( $optstack );