http://www.mediawiki.org/wiki/Special:Code/MediaWiki/90062

Revision: 90062
Author:   maxsem
Date:     2011-06-14 17:38:16 +0000 (Tue, 14 Jun 2011)
Log Message:
-----------
MFT r89598 to 1.17

Modified Paths:
--------------
    branches/REL1_17/phase3/RELEASE-NOTES
    branches/REL1_17/phase3/includes/installer/LocalSettingsGenerator.php

Property Changed:
----------------
    branches/REL1_17/phase3/includes/installer/LocalSettingsGenerator.php

Modified: branches/REL1_17/phase3/RELEASE-NOTES
===================================================================
--- branches/REL1_17/phase3/RELEASE-NOTES       2011-06-14 17:31:53 UTC (rev 
90061)
+++ branches/REL1_17/phase3/RELEASE-NOTES       2011-06-14 17:38:16 UTC (rev 
90062)
@@ -38,6 +38,10 @@
 * The lowest supported version of PHP is now 5.2.3. If necessary, please
   upgrade PHP prior to upgrading MediaWiki.
 
+=== Changes since 1.17.0rc1 ===
+* Fixed syntax error in generated LocalSettings.php when a non-default user
+rights profile is chosen.
+
 === Changes since 1.17 beta 1 ===
 
 * Fixed warning about missing file "password.js".

Modified: branches/REL1_17/phase3/includes/installer/LocalSettingsGenerator.php
===================================================================
--- branches/REL1_17/phase3/includes/installer/LocalSettingsGenerator.php       
2011-06-14 17:31:53 UTC (rev 90061)
+++ branches/REL1_17/phase3/includes/installer/LocalSettingsGenerator.php       
2011-06-14 17:38:16 UTC (rev 90062)
@@ -202,7 +202,7 @@
                                foreach( $rightArr as $right => $perm ) {
                                        $right = self::escapePhpString( $right 
);
                                        $groupRights .= 
"\$wgGroupPermissions['$group']['$right'] = " .
-                                               wfBoolToStr( $perm ) . "\n";
+                                               wfBoolToStr( $perm ) . ";\n";
                                }
                        }
                }


Property changes on: 
branches/REL1_17/phase3/includes/installer/LocalSettingsGenerator.php
___________________________________________________________________
Added: svn:mergeinfo
   + 
/branches/REL1_15/phase3/includes/installer/LocalSettingsGenerator.php:51646
/branches/new-installer/phase3/includes/installer/LocalSettingsGenerator.php:43664-66004
/branches/sqlite/includes/installer/LocalSettingsGenerator.php:58211-58321
/branches/wmf-deployment/includes/installer/LocalSettingsGenerator.php:53381
/trunk/phase3/includes/installer/LocalSettingsGenerator.php:82845,82847-82848,84875,84881-84882,84970,84976,85021,85066,88658,89311,89529,89598,89821


_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to