Merge "includes/api: Replace implicitly-Bugzilla bug numbers with Phab ones"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 28 Feb 2017 00:43:34 +0000 (00:43 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 28 Feb 2017 00:43:34 +0000 (00:43 +0000)
1  2 
includes/api/ApiMain.php

diff --combined includes/api/ApiMain.php
@@@ -574,7 -574,7 +574,7 @@@ class ApiMain extends ApiBase 
         * @param Exception $e
         */
        protected function handleException( Exception $e ) {
-               // Bug 63145: Rollback any open database transactions
+               // T65145: Rollback any open database transactions
                if ( !( $e instanceof ApiUsageException || $e instanceof UsageException ) ) {
                        // UsageExceptions are intentional, so don't rollback if that's the case
                        try {
                                )
                        );
                } else {
 -                      if ( $config->get( 'ShowExceptionDetails' ) ) {
 +                      if ( $config->get( 'ShowExceptionDetails' ) &&
 +                              ( !$e instanceof DBError || $config->get( 'ShowDBErrorBacktrace' ) )
 +                      ) {
                                $result->addContentValue(
                                        $path,
                                        'trace',
                $ret = $this->getRequest()->getVal( $name );
                if ( $ret === null ) {
                        if ( $this->getRequest()->getArray( $name ) !== null ) {
-                               // See bug 10262 for why we don't just implode( '|', ... ) the
+                               // See T12262 for why we don't just implode( '|', ... ) the
                                // array.
                                $this->addWarning( [ 'apiwarn-unsupportedarray', $name ] );
                        }