From: Trevor Parscal <tparscal@users.mediawiki.org>
Date: Mon, 20 Sep 2010 17:54:30 +0000 (+0000)
Subject: Fixed issues in r72940 - missing $ in release notes and remnant of ResourceLoaderUser... 
X-Git-Tag: 1.31.0-rc.0~34859
X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=commitdiff_plain;h=f652151c4143c84567f563027a83c2330584bc09;p=lhc%2Fweb%2Fwiklou.git

Fixed issues in r72940 - missing $ in release notes and remnant of ResourceLoaderUserPreferencesModule which is now ResourceLoaderUserOptionsModule
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 178b8f80a6..6a4c143253 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -59,7 +59,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   requests.
 * $wgResourceLoaderVersionedClientMaxage, $wgResourceLoaderVersionedServerMaxage,
   $wgResourceLoaderUnversionedClientMaxage and
-  wgResourceLoaderUnversionedServerMaxage were added to specify maxage and
+  $wgResourceLoaderUnversionedServerMaxage were added to specify maxage and
   smaxage times for responses from ResourceLoader based on whether the request's
   URL contained a version parameter or not.
 
diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index d1f3ef313a..14b27b80b0 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -2309,7 +2309,7 @@ class OutputPage {
 					$module = ResourceLoader::getModule( $name );
 					if (
 						$module instanceof ResourceLoaderWikiModule ||
-						$module instanceof ResourceLoaderUserPreferencesModule
+						$module instanceof ResourceLoaderUserOptionsModule
 					) {
 						$timestamp = max(
 							$timestamp,