| Index: trunk/phase3/includes/GlobalFunctions.php |
| — | — | @@ -947,16 +947,12 @@ |
| 948 | 948 | * log file is specified, (default true) |
| 949 | 949 | */ |
| 950 | 950 | function wfDebugLog( $logGroup, $text, $public = true ) { |
| 951 | | - global $wgDebugLogGroups, $wgShowHostnames; |
| | 951 | + global $wgDebugLogGroups; |
| 952 | 952 | $text = trim( $text ) . "\n"; |
| 953 | 953 | if( isset( $wgDebugLogGroups[$logGroup] ) ) { |
| 954 | 954 | $time = wfTimestamp( TS_DB ); |
| 955 | 955 | $wiki = wfWikiID(); |
| 956 | | - if ( $wgShowHostnames ) { |
| 957 | | - $host = wfHostname(); |
| 958 | | - } else { |
| 959 | | - $host = ''; |
| 960 | | - } |
| | 956 | + $host = wfHostname(); |
| 961 | 957 | if ( wfRunHooks( 'Debug', array( $text, $logGroup ) ) ) { |
| 962 | 958 | wfErrorLog( "$time $host $wiki: $text", $wgDebugLogGroups[$logGroup] ); |
| 963 | 959 | } |
| — | — | @@ -973,8 +969,9 @@ |
| 974 | 970 | function wfLogDBError( $text ) { |
| 975 | 971 | global $wgDBerrorLog, $wgDBname; |
| 976 | 972 | if ( $wgDBerrorLog ) { |
| 977 | | - $host = trim(`hostname`); |
| 978 | | - $text = date( 'D M j G:i:s T Y' ) . "\t$host\t$wgDBname\t$text"; |
| | 973 | + $host = wfHostname(); |
| | 974 | + $wiki = wfWikiID(); |
| | 975 | + $text = date( 'D M j G:i:s T Y' ) . "\t$host\t$wiki\t$text"; |
| 979 | 976 | wfErrorLog( $text, $wgDBerrorLog ); |
| 980 | 977 | } |
| 981 | 978 | } |