dépôts / lhc / web / wiklou.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: bab4f5d f193271)
Merge "Log a backtrace from the culprit location if headers were already sent"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 24 Feb 2017 22:41:45 +0000 (22:41 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 24 Feb 2017 22:41:45 +0000 (22:41 +0000)
1  2 
autoload.php patch | diff1 | diff2 | blob | history
includes/GlobalFunctions.php patch | diff1 | diff2 | blob | history

diff --combined autoload.php
index 41b6d81,fce7891..1863577
--- 1/autoload.php
--- 2/autoload.php
+++ b/autoload.php
@@@ -257,7 -257,6 +257,7 @@@ $wgAutoloadLocalClasses = 
        'ClearInterwikiCache' => __DIR__ . '/maintenance/clearInterwikiCache.php',
        'CliInstaller' => __DIR__ . '/includes/installer/CliInstaller.php',
        'CloneDatabase' => __DIR__ . '/includes/db/CloneDatabase.php',
 +      'CodeCleanerGlobalsPass' => __DIR__ . '/maintenance/CodeCleanerGlobalsPass.inc',
        'CodeContentHandler' => __DIR__ . '/includes/content/CodeContentHandler.php',
        'Collation' => __DIR__ . '/includes/collation/Collation.php',
        'CollationCkb' => __DIR__ . '/includes/collation/CollationCkb.php',
@@@ -813,7 -812,6 +813,7 @@@
        'MediaTransformOutput' => __DIR__ . '/includes/media/MediaTransformOutput.php',
        'MediaWiki' => __DIR__ . '/includes/MediaWiki.php',
        'MediaWikiI18N' => __DIR__ . '/includes/skins/MediaWikiI18N.php',
 +      'MediaWikiShell' => __DIR__ . '/maintenance/shell.php',
        'MediaWikiSite' => __DIR__ . '/includes/site/MediaWikiSite.php',
        'MediaWikiTitleCodec' => __DIR__ . '/includes/title/MediaWikiTitleCodec.php',
        'MediaWikiVersionFetcher' => __DIR__ . '/includes/MediaWikiVersionFetcher.php',
@@@ -854,6 -852,7 +854,7 @@@
        'MediaWiki\\Auth\\UsernameAuthenticationRequest' => __DIR__ . '/includes/auth/UsernameAuthenticationRequest.php',
        'MediaWiki\\Diff\\ComplexityException' => __DIR__ . '/includes/diff/ComplexityException.php',
        'MediaWiki\\Diff\\WordAccumulator' => __DIR__ . '/includes/diff/WordAccumulator.php',
+       'MediaWiki\\HeaderCallback' => __DIR__ . '/includes/HeaderCallback.php',
        'MediaWiki\\Interwiki\\ClassicInterwikiLookup' => __DIR__ . '/includes/interwiki/ClassicInterwikiLookup.php',
        'MediaWiki\\Interwiki\\InterwikiLookup' => __DIR__ . '/includes/interwiki/InterwikiLookup.php',
        'MediaWiki\\Interwiki\\InterwikiLookupAdapter' => __DIR__ . '/includes/interwiki/InterwikiLookupAdapter.php',
@@@ -1592,8 -1591,6 +1593,8 @@@
        'Wikimedia\\Rdbms\\LBFactorySimple' => __DIR__ . '/includes/libs/rdbms/lbfactory/LBFactorySimple.php',
        'Wikimedia\\Rdbms\\LBFactorySingle' => __DIR__ . '/includes/libs/rdbms/lbfactory/LBFactorySingle.php',
        'Wikimedia\\Rdbms\\LikeMatch' => __DIR__ . '/includes/libs/rdbms/encasing/LikeMatch.php',
 +      'Wikimedia\\Rdbms\\LoadBalancer' => __DIR__ . '/includes/libs/rdbms/loadbalancer/LoadBalancer.php',
 +      'Wikimedia\\Rdbms\\LoadBalancerSingle' => __DIR__ . '/includes/libs/rdbms/loadbalancer/LoadBalancerSingle.php',
        'Wikimedia\\Rdbms\\LoadMonitor' => __DIR__ . '/includes/libs/rdbms/loadmonitor/LoadMonitor.php',
        'Wikimedia\\Rdbms\\LoadMonitorMySQL' => __DIR__ . '/includes/libs/rdbms/loadmonitor/LoadMonitorMySQL.php',
        'Wikimedia\\Rdbms\\LoadMonitorNull' => __DIR__ . '/includes/libs/rdbms/loadmonitor/LoadMonitorNull.php',
diff --combined includes/GlobalFunctions.php
index 3c3cdb8,7a34c74..af5d5fa
--- 1/includes/GlobalFunctions.php
--- 2/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@@ -28,6 -28,7 +28,6 @@@ use Liuggio\StatsdClient\Sender\SocketS
  use MediaWiki\Logger\LoggerFactory;
  use MediaWiki\Session\SessionManager;
  use Wikimedia\ScopedCallback;
 -use Wikimedia\Rdbms\LBFactory;
  
  // Hide compatibility functions from Doxygen
  /// @cond
@@@ -1787,6 -1788,7 +1787,7 @@@ function wfHttpError( $code, $label, $d
                $wgOut->sendCacheControl();
        }
  
+       MediaWiki\HeaderCallback::warnIfHeadersSent();
        header( 'Content-type: text/html; charset=utf-8' );
        print '<!DOCTYPE html>' .
                '<html><head><title>' .
@@@ -3084,7 -3086,7 +3085,7 @@@ function wfGetDB( $db, $groups = [], $w
   *              or MediaWikiServices::getDBLoadBalancerFactory() instead.
   *
   * @param string|bool $wiki Wiki ID, or false for the current wiki
 - * @return LoadBalancer
 + * @return \Wikimedia\Rdbms\LoadBalancer
   */
  function wfGetLB( $wiki = false ) {
        if ( $wiki === false ) {
@@@ -3100,7 -3102,7 +3101,7 @@@
   *
   * @deprecated since 1.27, use MediaWikiServices::getDBLoadBalancerFactory() instead.
   *
 - * @return LBFactory
 + * @return \Wikimedia\Rdbms\LBFactory
   */
  function wfGetLBFactory() {
        return \MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory();
Wiklou, le Wiki du Wiklou