Add the user_properties table to the default for $wgSharedTables

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 0fcce7e..43188b7 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -289,11 +289,13 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   revisions when --delete is not passed
 * (bug 13172) GPS coordinates in image Exif data are now actually displayed
 * Overhaul of preferences system, includes the following bug fixes:
-* (bug 5363) Changes to default preferences now impact registered users.
-* (bug 14806) Hook to enable putting preferences in existing tabs.
-* (bug 17191) Registration date now listed on preferences page.
-* Note that this change will break some extensions which have not been adapted
-  for it.
+** (bug 5363) Changes to default preferences now impact registered users.
+** (bug 14806) Hook to enable putting preferences in existing tabs.
+** (bug 17191) Registration date now listed on preferences page.
+** The user_properties table (now used for storing preferences) has been added to 
+   $wgSharedTables.
+** Note that this change will break some extensions which have not been adapted
+   for it.
 * (bug 17020) Adding fallback encodings for Traditional and Simplified Chinese
   languages while the the text is typed as URLs.
 * (bug 17614) Prev / Next links are not shown if all results are shown

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 843cafc..17e76f9 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -648,6 +648,8 @@ $wgCheckDBSchema = true;
  * main database.
  * For backwards compatibility the shared prefix is set to the same as the local
  * prefix, and the user table is listed in the default list of shared tables.
+ * The user_properties table is also added so that users will continue to have their
+ * preferences shared (preferences were stored in the user table prior to 1.16)
  *
  * $wgSharedTables may be customized with a list of tables to share in the shared
  * datbase. However it is advised to limit what tables you do share as many of
@@ -656,7 +658,7 @@ $wgCheckDBSchema = true;
  */
 $wgSharedDB     = null;
 $wgSharedPrefix = false; # Defaults to $wgDBprefix
-$wgSharedTables = array( 'user' );
+$wgSharedTables = array( 'user', 'user_properties' );
 
 /**
  * Database load balancer