- Patch #9330: ucfirst() gives problem when used with multibyte charset.

  Replaced the use of ucfirst() with a CSS-based solution.

6 files changed, 6 insertions, 6 deletions

diff --git a/modules/block.module b/modules/block.module
index 93a93c260..d6aced3ca 100644
--- a/modules/block.module
+++ b/modules/block.module
@@ -361,7 +361,7 @@ function block_list($region) {
         $base = parse_url($base_url);
         $session = session_name() .'='. session_id();
         $url = str_replace(array($base['path'], '?'. $session), '', request_uri());
-        $url = ereg_replace('^/(\?q=)?', '', $url);      
+        $url = ereg_replace('^/(\?q=)?', '', $url);
         $matched = preg_match($block['path'], $url);
       }
       else {
diff --git a/modules/block/block.module b/modules/block/block.module
index 93a93c260..d6aced3ca 100644
--- a/modules/block/block.module
+++ b/modules/block/block.module
@@ -361,7 +361,7 @@ function block_list($region) {
         $base = parse_url($base_url);
         $session = session_name() .'='. session_id();
         $url = str_replace(array($base['path'], '?'. $session), '', request_uri());
-        $url = ereg_replace('^/(\?q=)?', '', $url);      
+        $url = ereg_replace('^/(\?q=)?', '', $url);
         $matched = preg_match($block['path'], $url);
       }
       else {
diff --git a/modules/tracker.module b/modules/tracker.module
index f5889ec9f..66816fece 100644
--- a/modules/tracker.module
+++ b/modules/tracker.module
@@ -63,7 +63,7 @@ function tracker_page($uid = 0) {
     }
 
     $rows[] = array(
-      ucfirst(node_invoke($node->type, 'node_name')),
+      node_invoke($node->type, 'node_name'),
       l($node->title, "node/$node->nid") .' '. (node_is_new($node->nid, $node->changed) ? theme('mark') : ''),
       format_name($node),
       array('class' => 'replies', 'data' => $comments),
diff --git a/modules/tracker/tracker.module b/modules/tracker/tracker.module
index f5889ec9f..66816fece 100644
--- a/modules/tracker/tracker.module
+++ b/modules/tracker/tracker.module
@@ -63,7 +63,7 @@ function tracker_page($uid = 0) {
     }
 
     $rows[] = array(
-      ucfirst(node_invoke($node->type, 'node_name')),
+      node_invoke($node->type, 'node_name'),
       l($node->title, "node/$node->nid") .' '. (node_is_new($node->nid, $node->changed) ? theme('mark') : ''),
       format_name($node),
       array('class' => 'replies', 'data' => $comments),
diff --git a/modules/user.module b/modules/user.module
index 832059081..9de1009e2 100644
--- a/modules/user.module
+++ b/modules/user.module
@@ -207,7 +207,7 @@ function user_validate_authmap($account, $authname, $module) {
   $result = db_query("SELECT COUNT(*) from {authmap} WHERE uid != %d AND authname = '%s'", $account->uid, $authname);
   if (db_result($result) > 0) {
     $name = module_invoke($module, 'info', 'name');
-    return t('The %u ID %s is already taken.', array('%u' => ucfirst($name), '%s' => "<i>$authname</i>"));
+    return t('The %u ID %s is already taken.', array('%u' => $name, '%s' => "<i>$authname</i>"));
   }
 }
 
diff --git a/modules/user/user.module b/modules/user/user.module
index 832059081..9de1009e2 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -207,7 +207,7 @@ function user_validate_authmap($account, $authname, $module) {
   $result = db_query("SELECT COUNT(*) from {authmap} WHERE uid != %d AND authname = '%s'", $account->uid, $authname);
   if (db_result($result) > 0) {
     $name = module_invoke($module, 'info', 'name');
-    return t('The %u ID %s is already taken.', array('%u' => ucfirst($name), '%s' => "<i>$authname</i>"));
+    return t('The %u ID %s is already taken.', array('%u' => $name, '%s' => "<i>$authname</i>"));
   }
 }