From: Sam Reed <reedy@users.mediawiki.org>
Date: Thu, 15 Dec 2011 14:56:09 +0000 (+0000)
Subject: Add a TODO with regards to existing mysql4 schemas..
X-Git-Tag: 1.31.0-rc.0~25956
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/categories/modifier.php?a=commitdiff_plain;h=d5e52d1a437dd7b8aa47a28ae240fa621485f46b;p=lhc%2Fweb%2Fwiklou.git

Add a TODO with regards to existing mysql4 schemas..
---

diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index b7f3e2577d..e99fd25ed2 100644
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -547,9 +547,9 @@ class SkinTemplate extends Skin {
 		/* set up the default links for the personal toolbar */
 		$personal_urls = array();
 
-		# Due to bug 32276, if a user does not have read permissions, 
-		# $this->getTitle() will just give Special:Badtitle, which is 
-		# not especially useful as a returnto parameter. Use the title 
+		# Due to bug 32276, if a user does not have read permissions,
+		# $this->getTitle() will just give Special:Badtitle, which is
+		# not especially useful as a returnto parameter. Use the title
 		# from the request instead, if there was one.
 		$page = Title::newFromURL( $request->getVal( 'title', '' ) );
 		$page = $request->getVal( 'returnto', $page );
diff --git a/includes/installer/MysqlInstaller.php b/includes/installer/MysqlInstaller.php
index 633ffcd3ca..a2c0b18dab 100644
--- a/includes/installer/MysqlInstaller.php
+++ b/includes/installer/MysqlInstaller.php
@@ -174,7 +174,7 @@ class MysqlInstaller extends DatabaseInstaller {
 				$existingEngine = false;
 			} else {
 				if ( preg_match( '/^latin1/', $row->Collation ) ) {
-					$existingSchema = 'mysql4';
+					$existingSchema = 'mysql4'; // TODO: This should go away/be dealt with
 				} elseif ( preg_match( '/^utf8/', $row->Collation ) ) {
 					$existingSchema = 'utf8';
 				} elseif ( preg_match( '/^binary/', $row->Collation ) ) {