[geeklog-cvs] geeklog: Improved detection of UTF-8 database dumps in migration...

[geeklog-cvs at lists.geeklog.net]

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/28fd720fa0de
changeset: 7152:28fd720fa0de
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Jun 28 09:22:09 2009 +0200
description:
Improved detection of UTF-8 database dumps in migration (bug #0000916)

diffstat:

 public_html/admin/install/migrate.php |  5 +++++
 public_html/docs/history              |  1 +
 2 files changed, 6 insertions(+), 0 deletions(-)

diffs (26 lines):

diff -r 96bdbb425e54 -r 28fd720fa0de public_html/admin/install/migrate.php
--- a/public_html/admin/install/migrate.php	Sat Jun 27 19:14:51 2009 +0200
+++ b/public_html/admin/install/migrate.php	Sun Jun 28 09:22:09 2009 +0200
@@ -630,6 +630,11 @@
                         if (strpos($line, 'SET NAMES utf8') !== false) {
                             $db_connection_charset = 'utf8';
                         }
+                    } elseif (empty($db_connection_charset) &&
+                            strpos($line, 'ENGINE=') !== false) {
+                        if (strpos($line, 'DEFAULT CHARSET=utf8') !== false) {
+                            $db_connection_charset = 'utf8';
+                        }
                     }
                 }
             }
diff -r 96bdbb425e54 -r 28fd720fa0de public_html/docs/history
--- a/public_html/docs/history	Sat Jun 27 19:14:51 2009 +0200
+++ b/public_html/docs/history	Sun Jun 28 09:22:09 2009 +0200
@@ -11,6 +11,7 @@
 + Comment moderation and editable comments, by Jared Wenerd
 
 Changes since 1.6.0b3:
+- Improved detection of UTF-8 database dumps in migration (bug #0000916) [Dirk]
 - Fixed typos in the install script (bugs #0000913 and #0000914) [Dirk]