Merge "Fix documentation of wfDebugLog()"

diff --combined includes/GlobalFunctions.php
index 981a556,58395db..0e95ef7
--- 1/includes/GlobalFunctions.php
--- 2/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@@ -1027,10 -1027,8 +1027,8 @@@ function wfDebugMem( $exact = false ) 
   *
   * @since 1.23 support for sampling log messages via $wgDebugLogGroups.
   *
-  * @param $logGroup String
-  * @param $text String
-  * @param bool $public whether to log the event in the public log if no private
-  *                     log file is specified, (default true)
+  * @param string $logGroup
+  * @param string $text
   * @param string|bool $dest Destination of the message:
   *     - 'all': both to the log and HTML (debug toolbar or HTML comments)
   *     - 'log': only to the log and not in HTML
@@@ -1109,7 -1107,7 +1107,7 @@@ function wfLogDBError( $text ) 
  
                $date = $d->format( 'D M j G:i:s T Y' );
  
 -              $text = "$date\t$host\t$wiki\t$text";
 +              $text = "$date\t$host\t$wiki\t" . trim( $text ) . "\n";
                wfErrorLog( $text, $wgDBerrorLog );
        }
  }