Merge "Use {{int:}} on MediaWiki:Blockedtext and MediaWiki:Autoblockedtext"

[lhc/web/wiklou.git] / includes / resourceloader / ResourceLoaderWikiModule.php

diff --git a/includes/resourceloader/ResourceLoaderWikiModule.php b/includes/resourceloader/ResourceLoaderWikiModule.php
index e87d28a..085244a 100644 (file)
--- a/includes/resourceloader/ResourceLoaderWikiModule.php
+++ b/includes/resourceloader/ResourceLoaderWikiModule.php
@@ -157,24 +157,22 @@ class ResourceLoaderWikiModule extends ResourceLoaderModule {
 
        /**
         * @param string $titleText
+        * @param ResourceLoaderContext|null $context (but passing null is deprecated)
         * @return null|string
+        * @since 1.32 added the $context parameter
         */
-       protected function getContent( $titleText ) {
+       protected function getContent( $titleText, ResourceLoaderContext $context = null ) {
                $title = Title::newFromText( $titleText );
                if ( !$title ) {
                        return null; // Bad title
                }
 
-               // If the page is a redirect, follow the redirect.
-               if ( $title->isRedirect() ) {
-                       $content = $this->getContentObj( $title );
-                       $title = $content ? $content->getUltimateRedirectTarget() : null;
-                       if ( !$title ) {
-                               return null; // Dead redirect
-                       }
+               $content = $this->getContentObj( $title, $context );
+               if ( !$content ) {
+                       return null; // No content found
                }
 
-               $handler = ContentHandler::getForTitle( $title );
+               $handler = $content->getContentHandler();
                if ( $handler->isSupportedFormat( CONTENT_FORMAT_CSS ) ) {
                        $format = CONTENT_FORMAT_CSS;
                } elseif ( $handler->isSupportedFormat( CONTENT_FORMAT_JAVASCRIPT ) ) {
@@ -183,31 +181,81 @@ class ResourceLoaderWikiModule extends ResourceLoaderModule {
                        return null; // Bad content model
                }
 
-               $content = $this->getContentObj( $title );
-               if ( !$content ) {
-                       return null; // No content found
-               }
-
                return $content->serialize( $format );
        }
 
        /**
         * @param Title $title
+        * @param ResourceLoaderContext|null $context (but passing null is deprecated)
+        * @param int|null $maxRedirects Maximum number of redirects to follow. If
+        *  null, uses $wgMaxRedirects
         * @return Content|null
+        * @since 1.32 added the $context and $maxRedirects parameters
         */
-       protected function getContentObj( Title $title ) {
-               $revision = Revision::newKnownCurrent( wfGetDB( DB_REPLICA ), $title );
-               if ( !$revision ) {
-                       return null;
+       protected function getContentObj(
+               Title $title, ResourceLoaderContext $context = null, $maxRedirects = null
+       ) {
+               if ( $context === null ) {
+                       wfDeprecated( __METHOD__ . ' without a ResourceLoader context', '1.32' );
                }
-               $content = $revision->getContent( Revision::RAW );
-               if ( !$content ) {
-                       wfDebugLog( 'resourceloader', __METHOD__ . ': failed to load content of JS/CSS page!' );
-                       return null;
+
+               $overrideCallback = $context ? $context->getContentOverrideCallback() : null;
+               $content = $overrideCallback ? call_user_func( $overrideCallback, $title ) : null;
+               if ( $content ) {
+                       if ( !$content instanceof Content ) {
+                               $this->getLogger()->error(
+                                       'Bad content override for "{title}" in ' . __METHOD__,
+                                       [ 'title' => $title->getPrefixedText() ]
+                               );
+                               return null;
+                       }
+               } else {
+                       $revision = Revision::newKnownCurrent( wfGetDB( DB_REPLICA ), $title );
+                       if ( !$revision ) {
+                               return null;
+                       }
+                       $content = $revision->getContent( Revision::RAW );
+
+                       if ( !$content ) {
+                               $this->getLogger()->error(
+                                       'Failed to load content of JS/CSS page "{title}" in ' . __METHOD__,
+                                       [ 'title' => $title->getPrefixedText() ]
+                               );
+                               return null;
+                       }
+               }
+
+               if ( $content && $content->isRedirect() ) {
+                       if ( $maxRedirects === null ) {
+                               $maxRedirects = $this->getConfig()->get( 'MaxRedirects' ) ?: 0;
+                       }
+                       if ( $maxRedirects > 0 ) {
+                               $newTitle = $content->getRedirectTarget();
+                               return $newTitle ? $this->getContentObj( $newTitle, $context, $maxRedirects - 1 ) : null;
+                       }
                }
+
                return $content;
        }
 
+       /**
+        * @param ResourceLoaderContext $context
+        * @return bool
+        */
+       public function shouldEmbedModule( ResourceLoaderContext $context ) {
+               $overrideCallback = $context->getContentOverrideCallback();
+               if ( $overrideCallback && $this->getSource() === 'local' ) {
+                       foreach ( $this->getPages( $context ) as $page => $info ) {
+                               $title = Title::newFromText( $page );
+                               if ( $title && call_user_func( $overrideCallback, $title ) !== null ) {
+                                       return true;
+                               }
+                       }
+               }
+
+               return parent::shouldEmbedModule( $context );
+       }
+
        /**
         * @param ResourceLoaderContext $context
         * @return string JavaScript code
@@ -218,7 +266,7 @@ class ResourceLoaderWikiModule extends ResourceLoaderModule {
                        if ( $options['type'] !== 'script' ) {
                                continue;
                        }
-                       $script = $this->getContent( $titleText );
+                       $script = $this->getContent( $titleText, $context );
                        if ( strval( $script ) !== '' ) {
                                $script = $this->validateScriptFile( $titleText, $script );
                                $scripts .= ResourceLoader::makeComment( $titleText ) . $script . "\n";
@@ -238,7 +286,7 @@ class ResourceLoaderWikiModule extends ResourceLoaderModule {
                                continue;
                        }
                        $media = isset( $options['media'] ) ? $options['media'] : 'all';
-                       $style = $this->getContent( $titleText );
+                       $style = $this->getContent( $titleText, $context );
                        if ( strval( $style ) === '' ) {
                                continue;
                        }
@@ -339,7 +387,26 @@ class ResourceLoaderWikiModule extends ResourceLoaderModule {
                if ( !isset( $this->titleInfo[$batchKey] ) ) {
                        $this->titleInfo[$batchKey] = static::fetchTitleInfo( $dbr, $pageNames, __METHOD__ );
                }
-               return $this->titleInfo[$batchKey];
+
+               $titleInfo = $this->titleInfo[$batchKey];
+
+               // Override the title info from the overrides, if any
+               $overrideCallback = $context->getContentOverrideCallback();
+               if ( $overrideCallback ) {
+                       foreach ( $pageNames as $page ) {
+                               $title = Title::newFromText( $page );
+                               $content = $title ? call_user_func( $overrideCallback, $title ) : null;
+                               if ( $content !== null ) {
+                                       $titleInfo[$title->getPrefixedText()] = [
+                                               'page_len' => $content->getSize(),
+                                               'page_latest' => 'TBD', // None available
+                                               'page_touched' => wfTimestamp( TS_MW ),
+                                       ];
+                               }
+                       }
+               }
+
+               return $titleInfo;
        }
 
        protected static function fetchTitleInfo( IDatabase $db, array $pages, $fname = __METHOD__ ) {