From 78b4b25ad60e775795e546a6e361ec55f259ff89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20Flode=CC=81n?= <jonas@koalasoft.se>
Date: Sat, 27 Aug 2011 18:23:24 +0200
Subject: [PATCH] Use multibyte version of strtolower

The function strtolower cannot handle UTF-8 properly. Replace it with the
function mb_strtolower specifying UTF-8 encoding.
---
 lib/Doctrine/Table.php |   15 +++++++--------
 1 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/lib/Doctrine/Table.php b/lib/Doctrine/Table.php
index 30c332b..4b4635c 100644
--- a/lib/Doctrine/Table.php
+++ b/lib/Doctrine/Table.php
@@ -473,7 +473,7 @@ class Doctrine_Table extends Doctrine_Configurable implements Countable
 
                         $e2 = explode(':', $option);
 
-                        switch (strtolower($e2[0])) {
+                        switch (mb_strtolower($e2[0], "UTF-8")) {
                             case 'autoincrement':
                             case 'autoinc':
                                 if ($value !== false) {
@@ -1164,7 +1164,7 @@ class Doctrine_Table extends Doctrine_Configurable implements Countable
             return $this->_columnNames[$fieldName];
         }
 
-        return strtolower($fieldName);
+        return mb_strtolower($fieldName, "UTF-8");
     }
 
     /**
@@ -1313,12 +1313,11 @@ class Doctrine_Table extends Doctrine_Configurable implements Countable
                 $fieldName = $parts[0];
             }
 
-            $name = strtolower($parts[0]);
+            $name = mb_strtolower($parts[0], "UTF-8");
         } else {
             $fieldName = $name;
-            $name = strtolower($name);
+            $name = mb_strtolower($name, "UTF-8");
         }
-
         $name = trim($name);
         $fieldName = trim($fieldName);
 
@@ -1375,7 +1374,7 @@ class Doctrine_Table extends Doctrine_Configurable implements Countable
         $options['type'] = $type;
         $options['length'] = $length;
         
-        if (strtolower($fieldName) != $name) {
+        if (mb_strtolower($fieldName, "UTF-8") != $name) {
             $options['alias'] = $fieldName;
         }
 
@@ -1461,7 +1460,7 @@ class Doctrine_Table extends Doctrine_Configurable implements Countable
      */
     public function hasColumn($columnName)
     {
-        return isset($this->_columns[strtolower($columnName)]);
+        return isset($this->_columns[mb_strtolower($columnName, "UTF-8")]);
     }
 
     /**
@@ -2809,7 +2808,7 @@ class Doctrine_Table extends Doctrine_Configurable implements Countable
      */
     public function __call($method, $arguments)
     {
-        $lcMethod = strtolower($method);
+        $lcMethod = mb_strtolower($method, "UTF-8");
 
         if (substr($lcMethod, 0, 6) == 'findby') {
             $by = substr($method, 6, strlen($method));
-- 
1.7.6