Merge "Make sure Parsoid doesn't get snobbish and treat non-html5 tags badly."

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

diff --git a/includes/ConfEditor.php b/includes/ConfEditor.php
index d304e65..e5c2e5c 100644 (file)
--- a/includes/ConfEditor.php
+++ b/includes/ConfEditor.php
@@ -66,7 +66,6 @@ class ConfEditor {
         */
        var $stateStack;
 
-
        /**
         * The path stack is a stack of associative arrays with the following elements:
         *    name              The name of top level of the path
@@ -1060,6 +1059,7 @@ class ConfEditorParseError extends MWException {
                                return "$line\n" .str_repeat( ' ', $this->colNum - 1 ) . "^\n";
                        }
                }
+               return '';
        }
 
 }
@@ -1094,4 +1094,3 @@ class ConfEditorToken {
                return $this->type == 'END';
        }
 }
-