Revert r111023 and r111024, they broke user.options . I'll fix this properly by split...

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 781aa61..cc9118a 100644 (file)
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -2681,10 +2681,8 @@ $templates
                );
 
                // Load embeddable private modules before any loader links
-               // Per bug 34289, this needs to be TYPE_SCRIPTS. Using TYPE_COMBINED
-               // causes the user.options CSS to be loaded twice.
                $embedScripts = array( 'user.options', 'user.tokens' );
-               $scripts .= $this->makeResourceLoaderLink( $embedScripts, ResourceLoaderModule::TYPE_SCRIPTS );
+               $scripts .= $this->makeResourceLoaderLink( $embedScripts, ResourceLoaderModule::TYPE_COMBINED );
 
                // Script and Messages "only" requests marked for top inclusion
                // Messages should go first