From d5e52d1a437dd7b8aa47a28ae240fa621485f46b Mon Sep 17 00:00:00 2001 From: Sam Reed Date: Thu, 15 Dec 2011 14:56:09 +0000 Subject: [PATCH] Add a TODO with regards to existing mysql4 schemas.. --- includes/SkinTemplate.php | 6 +++--- includes/installer/MysqlInstaller.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) 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 ) ) { -- 2.20.1