https://www.mediawiki.org/wiki/Special:Code/MediaWiki/106330
Revision: 106330
Author: reedy
Date: 2011-12-15 14:56:09 +0000 (Thu, 15 Dec 2011)
Log Message:
-----------
Add a TODO with regards to existing mysql4 schemas..
Modified Paths:
--------------
trunk/phase3/includes/SkinTemplate.php
trunk/phase3/includes/installer/MysqlInstaller.php
Modified: trunk/phase3/includes/SkinTemplate.php
===================================================================
--- trunk/phase3/includes/SkinTemplate.php 2011-12-15 14:42:05 UTC (rev
106329)
+++ trunk/phase3/includes/SkinTemplate.php 2011-12-15 14:56:09 UTC (rev
106330)
@@ -547,9 +547,9 @@
/* 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 );
Modified: trunk/phase3/includes/installer/MysqlInstaller.php
===================================================================
--- trunk/phase3/includes/installer/MysqlInstaller.php 2011-12-15 14:42:05 UTC
(rev 106329)
+++ trunk/phase3/includes/installer/MysqlInstaller.php 2011-12-15 14:56:09 UTC
(rev 106330)
@@ -174,7 +174,7 @@
$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 ) ) {
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
