Fix "you are blocked" message for users who were blocked by zero-ID user.

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

diff --git a/includes/ConfEditor.php b/includes/ConfEditor.php
index 5ac1d7f..f862ebb 100644 (file)
--- a/includes/ConfEditor.php
+++ b/includes/ConfEditor.php
@@ -306,12 +306,17 @@ class ConfEditor {
        function parseScalar( $str ) {
                if ( $str !== '' && $str[0] == '\'' )
                        // Single-quoted string
-                       return strtr( substr( $str, 1, -1 ),
+                       // @todo Fixme: trim() call is due to mystery bug where whitespace gets
+                       // appended to the token; without it we ended up reading in the
+                       // extra quote on the end!
+                       return strtr( substr( trim( $str ), 1, -1 ),
                                array( '\\\'' => '\'', '\\\\' => '\\' ) );
                if ( $str !== '' && @$str[0] == '"' )
                        // Double-quoted string
-                       return strtr( stripcslashes( substr( $str, 1, -1 ) ),
-                                array( '\'' => '\\\'' ) );
+                       // @todo Fixme: trim() call is due to mystery bug where whitespace gets
+                       // appended to the token; without it we ended up reading in the
+                       // extra quote on the end!
+                       return stripcslashes( substr( trim( $str ), 1, -1 ) );
                if ( substr( $str, 0, 4 ) == 'true' )
                        return true;
                if ( substr( $str, 0, 5 ) == 'false' )