Merge "Improve documentation for OutputPage->addModuleStyles"

diff --combined includes/OutputPage.php
index 8a95f04,881689c..6309ecb
--- 1/includes/OutputPage.php
--- 2/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@@ -521,9 -521,11 +521,11 @@@ class OutputPage extends ContextSource 
        }
  
        /**
-        * Add only CSS of one or more modules recognized by the resource loader. Module
-        * styles added through this function will be loaded by the resource loader when
-        * the page loads.
+        * Add only CSS of one or more modules recognized by the resource loader.
+        *
+        * Module styles added through this function will be added using standard link CSS
+        * tags, rather than as a combined Javascript and CSS package. Thus, they will
+        * load when JavaScript is disabled (unless CSS also happens to be disabled).
         *
         * @param $modules Mixed: module name (string) or array of module names
         */
@@@ -3029,8 -3031,7 +3031,8 @@@ $template
                if ( $user->isLoggedIn() ) {
                        $vars['wgUserId'] = $user->getId();
                        $vars['wgUserEditCount'] = $user->getEditCount();
 -                      $vars['wgUserRegistration'] = $user->getRegistration();
 +                      $userReg = wfTimestampOrNull( TS_UNIX, $user->getRegistration() );
 +                      $vars['wgUserRegistration'] = $userReg !== null ? ( $userReg * 1000 ) : null;
                }
                if ( $wgContLang->hasVariants() ) {
                        $vars['wgUserVariant'] = $wgContLang->getPreferredVariant();