Add devunt to CREDITS as patch contributor

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

diff --git a/includes/ConfEditor.php b/includes/ConfEditor.php
index d304e65..1d9ca92 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
@@ -128,7 +127,7 @@ class ConfEditor {
 
        /**
         * Edit the text. Returns the edited text.
-        * @param $ops Array of operations.
+        * @param array $ops of operations.
         *
         * Operations are given as an associative array, with members:
         *    type:     One of delete, set, append or insert (required)
@@ -307,7 +306,7 @@ class ConfEditor {
         * setVar( $arr, 'foo/bar', 'baz', 3 ); will set
         * $arr['foo']['bar']['baz'] = 3;
         * @param $array array
-        * @param $path string slash-delimited path
+        * @param string $path slash-delimited path
         * @param $key mixed Key
         * @param $value mixed Value
         */
@@ -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';
        }
 }
-