- Patch #9330: ucfirst() gives problem when used with multibyte charset.
Replaced the use of ucfirst() with a CSS-based solution.4.5.x
							parent
							
								
									f037130086
								
							
						
					
					
						commit
						9bbdb71ee4
					
				| 
						 | 
				
			
			@ -354,7 +354,7 @@ CREATE TABLE node_access (
 | 
			
		|||
  grant_update smallint NOT NULL default '0',
 | 
			
		||||
  grant_delete smallint NOT NULL default '0',
 | 
			
		||||
  PRIMARY KEY  (nid,gid,realm)
 | 
			
		||||
); 
 | 
			
		||||
);
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
--
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1113,7 +1113,7 @@ function update_88() {
 | 
			
		|||
    $ret[] = update_sql("ALTER TABLE {menu} DROP status");
 | 
			
		||||
    $ret[] = update_sql("ALTER TABLE {menu} DROP visibility");
 | 
			
		||||
    $ret[] = update_sql("ALTER TABLE {menu} ADD type INT(2) UNSIGNED DEFAULT '0' NOT NULL");
 | 
			
		||||
  } 
 | 
			
		||||
  }
 | 
			
		||||
  else {
 | 
			
		||||
    $ret[] = update_sql("ALTER TABLE {menu} ADD type smallint");
 | 
			
		||||
    $ret[] = update_sql("ALTER TABLE {menu} ALTER COLUMN type SET DEFAULT '0'");
 | 
			
		||||
| 
						 | 
				
			
			@ -1126,7 +1126,7 @@ function update_88() {
 | 
			
		|||
 | 
			
		||||
function update_89() {
 | 
			
		||||
  $ret = array();
 | 
			
		||||
  
 | 
			
		||||
 | 
			
		||||
  if ($GLOBALS['db_type'] == 'mysql') {
 | 
			
		||||
    $ret[] = update_sql("ALTER TABLE {node} CHANGE static sticky INT(2) DEFAULT '0' NOT NULL");
 | 
			
		||||
  }
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -19,7 +19,7 @@ function drupal_set_title($title = NULL) {
 | 
			
		|||
  static $stored_title;
 | 
			
		||||
 | 
			
		||||
  if (isset($title)) {
 | 
			
		||||
    $stored_title = ucfirst($title);
 | 
			
		||||
    $stored_title = $title;
 | 
			
		||||
  }
 | 
			
		||||
  return $stored_title;
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -404,7 +404,7 @@ function menu_get_active_title() {
 | 
			
		|||
  $menu = menu_get_menu();
 | 
			
		||||
 | 
			
		||||
  if ($mid = menu_get_active_nontask_item()) {
 | 
			
		||||
    return ucfirst($menu['items'][$mid]['title']);
 | 
			
		||||
    return $menu['items'][$mid]['title'];
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -204,12 +204,12 @@ function theme_status_messages() {
 | 
			
		|||
      if (count($messages) > 1) {
 | 
			
		||||
        $output .= " <ul>\n";
 | 
			
		||||
        foreach($messages as $message) {
 | 
			
		||||
          $output .= '  <li>'. ucfirst($message) ."</li>\n";
 | 
			
		||||
          $output .= '  <li>'. $message ."</li>\n";
 | 
			
		||||
        }
 | 
			
		||||
        $output .= " </ul>\n";
 | 
			
		||||
      }
 | 
			
		||||
      else {
 | 
			
		||||
        $output .= ucfirst($messages[0]);
 | 
			
		||||
        $output .= $messages[0];
 | 
			
		||||
      }
 | 
			
		||||
      $output .= "</div>\n";
 | 
			
		||||
    }
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -87,6 +87,14 @@ li a.active {
 | 
			
		|||
td.menu-disabled {
 | 
			
		||||
  background: #ccc;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
/*
 | 
			
		||||
** CSS capitalization
 | 
			
		||||
*/
 | 
			
		||||
.title:first-letter,
 | 
			
		||||
.messages:first-letter,
 | 
			
		||||
.messages li:first-letter { text-transform: uppercase; }
 | 
			
		||||
 | 
			
		||||
/*
 | 
			
		||||
** Other common styles
 | 
			
		||||
*/
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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 {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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 {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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),
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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),
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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>"));
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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>"));
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue