From f652151c4143c84567f563027a83c2330584bc09 Mon Sep 17 00:00:00 2001
From: Trevor Parscal <tparscal@users.mediawiki.org>
Date: Mon, 20 Sep 2010 17:54:30 +0000
Subject: [PATCH] Fixed issues in r72940 - missing $ in release notes and
 remnant of ResourceLoaderUserPreferencesModule which is now
 ResourceLoaderUserOptionsModule

---
 RELEASE-NOTES           | 2 +-
 includes/OutputPage.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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,
-- 
2.20.1