Merge "(bug 37195) Doc fix. $from and $until are arrays since 1.17."

[lhc/web/wiklou.git] / includes / api / ApiFormatBase.php
diff --git a/includes/api/ApiFormatBase.php b/includes/api/ApiFormatBase.php

index 7dfdffc..8ad9b8c 100644 (file)
--- a/includes/api/ApiFormatBase.php
+++ b/includes/api/ApiFormatBase.php
@@ -4,7 +4,7 @@
   *
   * Created on Sep 19, 2006
   *
- * Copyright © 2006 Yuri Astrakhan <Firstname><Lastname>@gmail.com
+ * Copyright © 2006 Yuri Astrakhan "<Firstname><Lastname>@gmail.com"
   *
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
@@ -143,6 +143,12 @@ abstract class ApiFormatBase extends ApiBase {
  
                 $this->getMain()->getRequest()->response()->header( "Content-Type: $mime; charset=utf-8" );
  
+               //Set X-Frame-Options API results (bug 39180)
+               global $wgApiFrameOptions;
+               if ( $wgApiFrameOptions ) {
+                       $this->getMain()->getRequest()->response()->header( "X-Frame-Options: $wgApiFrameOptions" );
+               }
+
                 if ( $isHtml ) {
  ?>
  <!DOCTYPE HTML>
@@ -265,7 +271,7 @@ See the <a href='https://www.mediawiki.org/wiki/API'>complete documentation</a>,
                 // identify URLs
                 $protos = wfUrlProtocolsWithoutProtRel();
                 // This regex hacks around bug 13218 (&quot; included in the URL)
-               $text = preg_replace( "#(($protos).*?)(&quot;)?([ \\'\"<>\n]|&lt;|&gt;|&quot;)#", '<a href="\\1">\\1</a>\\3\\4', $text );
+               $text = preg_replace( "#(((?i)$protos).*?)(&quot;)?([ \\'\"<>\n]|&lt;|&gt;|&quot;)#", '<a href="\\1">\\1</a>\\3\\4', $text );
                 // identify requests to api.php
                 $text = preg_replace( "#api\\.php\\?[^ <\n\t]+#", '<a href="\\0">\\0</a>', $text );
                 if ( $this->mHelp ) {
@@ -326,7 +332,7 @@ class ApiFormatFeedWrapper extends ApiFormatBase {
          */
         public static function setResult( $result, $feed, $feedItems ) {
                 // Store output in the Result data.
-               // This way we can check during execution if any error has occured
+               // This way we can check during execution if any error has occurred
                 // Disable size checking for this because we can't continue
                 // cleanly; size checking would cause more problems than it'd
                 // solve
@@ -371,7 +377,7 @@ class ApiFormatFeedWrapper extends ApiFormatBase {
                         }
                         $feed->outFooter();
                 } else {
-                       // Error has occured, print something useful
+                       // Error has occurred, print something useful
                         ApiBase::dieDebug( __METHOD__, 'Invalid feed class/item' );
                 }
         }