| Index: trunk/phase3/includes/OutputPage.php |
| — | — | @@ -2681,6 +2681,8 @@ |
| 2682 | 2682 | ); |
| 2683 | 2683 | |
| 2684 | 2684 | // Load embeddable private modules before any loader links |
| | 2685 | + // Per bug 34289, this needs to be TYPE_SCRIPTS. Using TYPE_COMBINED |
| | 2686 | + // causes the user.options CSS to be loaded twice. |
| 2685 | 2687 | $embedScripts = array( 'user.options', 'user.tokens' ); |
| 2686 | 2688 | $scripts .= $this->makeResourceLoaderLink( $embedScripts, ResourceLoaderModule::TYPE_SCRIPTS ); |
| 2687 | 2689 | |