Merge "GitInfo: Allow cache to be in the extension directory itself"

[lhc/web/wiklou.git] / includes / api / ApiFormatPhp.php

diff --git a/includes/api/ApiFormatPhp.php b/includes/api/ApiFormatPhp.php
index a6a6f32..df9d581 100644 (file)
--- a/includes/api/ApiFormatPhp.php
+++ b/includes/api/ApiFormatPhp.php
@@ -55,7 +55,7 @@ class ApiFormatPhp extends ApiFormatBase {
                                break;
 
                        default:
-                               self::dieUsage( __METHOD__ . ': Unknown value for \'formatversion\'' );
+                               $this->dieUsage( __METHOD__ . ': Unknown value for \'formatversion\'', 'unknownformatversion' );
                }
                $text = serialize( $this->getResult()->getResultData( null, $transforms ) );
 
@@ -68,7 +68,8 @@ class ApiFormatPhp extends ApiFormatBase {
                        preg_match( '/\<\s*cross-domain-policy\s*\>/i', $text )
                ) {
                        $this->dieUsage(
-                               'This response cannot be represented using format=php. See https://bugzilla.wikimedia.org/show_bug.cgi?id=66776',
+                               'This response cannot be represented using format=php. ' .
+                               'See https://phabricator.wikimedia.org/T68776',
                                'internalerror'
                        );
                }