* Trim whitespace from option values to weather line-ending corruption problems

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 07a9165..7ec1db5 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -326,6 +326,7 @@ Various bugfixes, small features, and a few experimental things:
 * (bug 750) Keep line endings consistent in LocalSettings.php
 * (bug 1577) Add 'printable version' tab in MonoBook for people who don't
   realize you can just hit print to get a nicely formatted printable page.
+* Trim whitespace from option values to weather line-ending corruption problems
 
 
 === Caveats ===

diff --git a/includes/User.php b/includes/User.php
index 4242b81..c73da93 100644 (file)
--- a/includes/User.php
+++ b/includes/User.php
@@ -775,7 +775,7 @@ class User {
        function getOption( $oname ) {
                $this->loadFromDatabase();
                if ( array_key_exists( $oname, $this->mOptions ) ) {
-                       return $this->mOptions[$oname];
+                       return trim( $this->mOptions[$oname] );
                } else {
                        return '';
                }