| Index: trunk/phase3/includes/GlobalFunctions.php |
| — | — | @@ -706,11 +706,9 @@ |
| 707 | 707 | $now = wfTime(); |
| 708 | 708 | $elapsed = $now - $wgRequestTime; |
| 709 | 709 | |
| 710 | | - if ($wgShowHostnames) { |
| 711 | | - return sprintf( "<!-- Served by %s in %01.3f secs. -->", wfHostname(), $elapsed ); |
| 712 | | - } else { |
| 713 | | - return sprintf( "<!-- Served in %01.3f secs. -->", $elapsed ); |
| 714 | | - } |
| | 710 | + return $wgShowHostnames |
| | 711 | + ? sprintf( "<!-- Served by %s in %01.3f secs. -->", wfHostname(), $elapsed ) |
| | 712 | + : sprintf( "<!-- Served in %01.3f secs. -->", $elapsed ); |
| 715 | 713 | } |
| 716 | 714 | |
| 717 | 715 | /** |
| Index: trunk/phase3/includes/Wiki.php |
| — | — | @@ -58,14 +58,13 @@ |
| 59 | 59 | |
| 60 | 60 | function checkMaxLag( $maxLag ) { |
| 61 | 61 | global $wgLoadBalancer, $wgShowHostnames; |
| 62 | | - |
| 63 | 62 | list( $host, $lag ) = $wgLoadBalancer->getMaxLag(); |
| 64 | 63 | if ( $lag > $maxLag ) { |
| 65 | 64 | header( 'HTTP/1.1 503 Service Unavailable' ); |
| 66 | 65 | header( 'Retry-After: ' . max( intval( $maxLag ), 5 ) ); |
| 67 | 66 | header( 'X-Database-Lag: ' . intval( $lag ) ); |
| 68 | 67 | header( 'Content-Type: text/plain' ); |
| 69 | | - if ($wgShowHostnames) { |
| | 68 | + if( $wgShowHostnames ) { |
| 70 | 69 | echo "Waiting for $host: $lag seconds lagged\n"; |
| 71 | 70 | } else { |
| 72 | 71 | echo "Waiting for a database server: $lag seconds lagged\n"; |
| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -921,12 +921,12 @@ |
| 922 | 922 | $wgShowExceptionDetails = false; |
| 923 | 923 | |
| 924 | 924 | /** |
| 925 | | - * If set to true, exposes host names through API and HTML comments. |
| | 925 | + * Expose server host names through the API and various HTML comments |
| 926 | 926 | */ |
| 927 | 927 | $wgShowHostnames = false; |
| 928 | | - |
| 929 | | -/** * disable experimental dmoz-like category browsing. Output things like: |
| 930 | | - * Encyclopedia > Music > Style of Music > Jazz |
| | 928 | + |
| | 929 | +/** |
| | 930 | + * Use experimental, DMOZ-like category browser |
| 931 | 931 | */ |
| 932 | 932 | $wgUseCategoryBrowser = false; |
| 933 | 933 | |
| — | — | @@ -2690,6 +2690,4 @@ |
| 2691 | 2691 | * show a more obvious warning. |
| 2692 | 2692 | */ |
| 2693 | 2693 | $wgSlaveLagWarning = 10; |
| 2694 | | -$wgSlaveLagCritical = 30; |
| 2695 | | - |
| 2696 | | - |
| | 2694 | +$wgSlaveLagCritical = 30; |
| \ No newline at end of file |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -25,7 +25,7 @@ |
| 26 | 26 | * $wgAddGroups, $wgRemoveGroups - Finer control over who can assign which |
| 27 | 27 | usergroups |
| 28 | 28 | * $wgEnotifImpersonal, $wgEnotifUseJobQ - Bulk mail options for large sites |
| 29 | | -* $wgShowHostnames - Shows host names in API results and HTML comments |
| | 29 | +* $wgShowHostnames - Expose server host names through the API and HTML comments |
| 30 | 30 | |
| 31 | 31 | == New features since 1.10 == |
| 32 | 32 | |