Merge "Add RL targets support to OutputPage"

diff --combined includes/OutputPage.php
index 0099461,81a00ec..942f9bd
--- 1/includes/OutputPage.php
--- 2/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@@ -253,6 -253,11 +253,11 @@@ class OutputPage extends ContextSource 
         */
        private $mProperties = array();
  
+       /**
+        * @var string|null: ResourceLoader target for load.php links. If null, will be omitted
+        */
+       private $mTarget = null;
+ 
        /**
         * Constructor for OutputPage. This should not be called directly.
         * Instead a new RequestContext should be created and it will implicitly create
@@@ -451,7 -456,8 +456,8 @@@
                        $module = $resourceLoader->getModule( $val );
                        if( $module instanceof ResourceLoaderModule
                                && $module->getOrigin() <= $this->getAllowedModules( $type )
-                               && ( is_null( $position ) || $module->getPosition() == $position ) )
+                               && ( is_null( $position ) || $module->getPosition() == $position )
+                               && ( !$this->mTarget || in_array( $this->mTarget, $module->getTargets() ) ) )
                        {
                                $filteredModules[] = $val;
                        }
@@@ -556,6 -562,22 +562,22 @@@
                $this->mModuleMessages = array_merge( $this->mModuleMessages, (array)$modules );
        }
  
+       /**
+        * @return null|string: ResourceLoader target
+        */
+       public function getTarget() {
+               return $this->mTarget;
+       }
+ 
+       /**
+        * Sets ResourceLoader target for load.php links. If null, will be omitted
+        *
+        * @param $target string|null
+        */
+       public function setTarget( $target ) {
+               $this->mTarget = $target;
+       }
+ 
        /**
         * Get an array of head items
         *
@@@ -2401,6 -2423,7 +2423,6 @@@ $template
                        $proto = PROTO_RELATIVE;
                }
  
 -              $this->addLink( array( 'rel' => 'next', 'href' => $title->getFullURL( '', false, $proto ) ) );
                $link = $this->msg( 'returnto' )->rawParams(
                        Linker::link( $title, $text, array(), $query, $options ) )->escaped();
                $this->addHTML( "<p id=\"mw-returnto\">{$link}</p>\n" );
@@@ -2599,6 -2622,9 +2621,9 @@@
                                return $links;
                        }
                }
+               if ( !is_null( $this->mTarget ) ) {
+                       $extraQuery['target'] = $this->mTarget;
+               }
  
                // Create keyed-by-group list of module objects from modules list
                $groups = array();
@@@ -2611,6 -2637,7 +2636,7 @@@
                                        && $only == ResourceLoaderModule::TYPE_SCRIPTS )
                                || ( $module->getOrigin() > $this->getAllowedModules( ResourceLoaderModule::TYPE_STYLES )
                                        && $only == ResourceLoaderModule::TYPE_STYLES )
+                               || ( $this->mTarget && !in_array( $this->mTarget, $module->getTargets() ) )
                                )
                        {
                                continue;