Revert fix of bug 8326 in r18461, plus an unrelated change to DefaultSettings.php.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 8fa45ca..d3b97d0 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -348,7 +348,6 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   work when new releases of Safari appear.
 * Fix regression in thumb styles; size and padding didn't match with
   new arrangement.
-* (bug 8326) Fix regression in thumb styles of cached content
 * (bug 8333) Fix quick user data update on login password change on
   replication database setups. User data is now pulled from master
   instead of slave in User::loadFromDatabase, ensuring that it is

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 7f8b40e..88e440d 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -701,13 +701,23 @@ $wgAmericanDates    = false;
  */
 $wgTranslateNumerals = true;
 
-
-# Translation using MediaWiki: namespace
-# This will increase load times by 25-60% unless memcached is installed
-# Interface messages will be loaded from the database.
+/**
+ * Translation using MediaWiki: namespace.
+ * This will increase load times by 25-60% unless memcached is installed.
+ * Interface messages will be loaded from the database.
+ */
 $wgUseDatabaseMessages = true;
+
+/**
+ * Expiry time for the message cache key
+ */
 $wgMsgCacheExpiry      = 86400;
 
+/**
+ * Maximum entry size in the message cache, in bytes
+ */
+$wgMaxMsgCacheEntrySize = 10000;
+
 # Whether to enable language variant conversion.
 $wgDisableLangConversion = false;
 
@@ -1071,7 +1081,7 @@ $wgCacheEpoch = '20030516000000';
  * to ensure that client-side caches don't keep obsolete copies of global
  * styles.
  */
-$wgStyleVersion = '39';
+$wgStyleVersion = '40';
 
 
 # Server-side caching:

diff --git a/skins/common/common.css b/skins/common/common.css
index 77c10f6..f3e5b57 100644 (file)
--- a/skins/common/common.css
+++ b/skins/common/common.css
@@ -56,7 +56,6 @@ div.thumb {
        border-color: white;
        width: auto;
 }
-div.thumb div,
 div.thumbinner {
        border: 1px solid #ccc;
        padding: 3px !important;
@@ -65,11 +64,9 @@ div.thumbinner {
        text-align: center;
        overflow: hidden;
 }
-div.thumb div a img,
 html .thumbimage {
        border: 1px solid #ccc;
 }
-div.thumb div div.thumbcaption,
 html .thumbcaption {
        border: none;
        text-align: left;

diff --git a/skins/monobook/main.css b/skins/monobook/main.css
index 6efa9fe..2205832 100644 (file)
--- a/skins/monobook/main.css
+++ b/skins/monobook/main.css
@@ -430,7 +430,6 @@ div.thumb {
        border-color: white;
        width: auto;
 }
-div.thumb div,
 div.thumbinner {
        border: 1px solid #ccc;
        padding: 3px !important;
@@ -439,11 +438,9 @@ div.thumbinner {
        text-align: center;
        overflow: hidden;
 }
-div.thumb div a img,
 html .thumbimage {
        border: 1px solid #ccc;
 }
-div.thumb div div.thumbcaption,
 html .thumbcaption {
        border: none;
        text-align: left;