Index: includes/unicode.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/unicode.inc,v
retrieving revision 1.29
diff -u -r1.29 unicode.inc
--- includes/unicode.inc 28 Dec 2007 12:02:50 -0000 1.29
+++ includes/unicode.inc 21 Feb 2008 01:35:26 -0000
@@ -231,8 +231,7 @@
* @return
* The truncated string.
*/
-function truncate_utf8($string, $len, $wordsafe = FALSE, $dots = FALSE) {
-
+function drupal_truncate_chars($string, $len, $wordsafe = FALSE, $dots = FALSE) {
if (drupal_strlen($string) <= $len) {
return $string;
}
Index: includes/locale.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/locale.inc,v
retrieving revision 1.174
diff -u -r1.174 comment.module
--- modules/comment/comment.module 09 Jan 2008 21:36:13 -0000 1.174
+++ modules/comment/comment.module 21 Feb 2008 01:35:30 -0000
@@ -1979,7 +1979,7 @@
foreach ($arr as $lid => $value) {
$rows[] = array(
$value['group'],
- array('data' => check_plain(truncate_utf8($value['source'], 150, FALSE, TRUE)) .'
'. $value['location'] .''),
+ array('data' => check_plain(drupal_truncate_chars($value['source'], 150, FALSE, TRUE)) .'
'. $value['location'] .''),
array('data' => _locale_translate_language_list($value['languages'], $limit_language), 'align' => 'center'),
array('data' => l(t('edit'), "admin/build/translate/edit/$lid"), 'class' => 'nowrap'),
array('data' => l(t('delete'), "admin/build/translate/delete/$lid"), 'class' => 'nowrap'),
Index: modules/aggregator/aggregator.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator.module,v
retrieving revision 1.375
diff -u -r1.375 aggregator.module
--- modules/aggregator/aggregator.module 20 Feb 2008 13:46:37 -0000 1.375
+++ modules/aggregator/aggregator.module 21 Feb 2008 01:35:27 -0000
@@ -740,7 +740,7 @@
$title = $item['TITLE'];
}
elseif (!empty($item['DESCRIPTION'])) {
- $title = preg_replace('/^(.*)[^\w;&].*?$/', "\\1", truncate_utf8($item['DESCRIPTION'], 40));
+ $title = preg_replace('/^(.*)[^\w;&].*?$/', "\\1", drupal_truncate_chars($item['DESCRIPTION'], 40));
}
else {
$title = '';
Index: modules/book/book.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/book/book.module,v
retrieving revision 1.457
diff -u -r1.457 book.module
--- modules/book/book.module 20 Feb 2008 13:46:39 -0000 1.457
+++ modules/book/book.module 21 Feb 2008 01:35:28 -0000
@@ -844,7 +844,7 @@
break;
}
if (!in_array($data['link']['mlid'], $exclude)) {
- $toc[$data['link']['mlid']] = $indent .' '. truncate_utf8($data['link']['title'], 30, TRUE, TRUE);
+ $toc[$data['link']['mlid']] = $indent .' '. drupal_truncate_chars($data['link']['title'], 30, TRUE, TRUE);
if ($data['below']) {
_book_toc_recurse($data['below'], $indent .'--', $toc, $exclude, $depth_limit);
}
Index: modules/comment/comment.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.admin.inc,v
retrieving revision 1.4
diff -u -r1.4 comment.admin.inc
--- modules/comment/comment.admin.inc 8 Jan 2008 10:35:41 -0000 1.4
+++ modules/comment/comment.admin.inc 21 Feb 2008 01:35:28 -0000
@@ -64,7 +64,7 @@
while ($comment = db_fetch_object($result)) {
$comments[$comment->cid] = '';
$comment->name = $comment->uid ? $comment->registered_name : $comment->name;
- $form['subject'][$comment->cid] = array('#value' => l($comment->subject, 'node/'. $comment->nid, array('title' => truncate_utf8($comment->comment, 128), 'fragment' => 'comment-'. $comment->cid)));
+ $form['subject'][$comment->cid] = array('#value' => l($comment->subject, 'node/'. $comment->nid, array('title' => drupal_truncate_chars($comment->comment, 128), 'fragment' => 'comment-'. $comment->cid)));
$form['username'][$comment->cid] = array('#value' => theme('username', $comment));
$form['node_title'][$comment->cid] = array('#value' => l($comment->node_title, 'node/'. $comment->nid));
$form['timestamp'][$comment->cid] = array('#value' => format_date($comment->timestamp, 'small'));
Index: modules/comment/comment.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.module,v
retrieving revision 1.619
diff -u -r1.619 comment.module
--- modules/comment/comment.module 20 Feb 2008 13:46:39 -0000 1.619
+++ modules/comment/comment.module 21 Feb 2008 01:35:29 -0000
@@ -1525,7 +1525,7 @@
// 2) Strip out all HTML tags
// 3) Convert entities back to plain-text.
// Note: format is checked by check_markup().
- $comment_values['subject'] = trim(truncate_utf8(decode_entities(strip_tags(check_markup($comment_values['comment'], $comment_values['format']))), 29, TRUE));
+ $comment_values['subject'] = trim(drupal_truncate_chars(decode_entities(strip_tags(check_markup($comment_values['comment'], $comment_values['format']))), 29, TRUE));
// Edge cases where the comment body is populated only by HTML tags will
// require a default subject.
if ($comment_values['subject'] == '') {
Index: modules/dblog/dblog.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/dblog/dblog.admin.inc,v
retrieving revision 1.6
diff -u -r1.6 dblog.admin.inc
--- modules/dblog/dblog.admin.inc 8 Jan 2008 10:35:41 -0000 1.6
+++ modules/dblog/dblog.admin.inc 21 Feb 2008 01:35:29 -0000
@@ -68,7 +68,7 @@
$icons[$dblog->severity],
t($dblog->type),
format_date($dblog->timestamp, 'small'),
- l(truncate_utf8(_dblog_format_message($dblog), 56, TRUE, TRUE), 'admin/reports/event/'. $dblog->wid, array('html' => TRUE)),
+ l(drupal_truncate_chars(_dblog_format_message($dblog), 56, TRUE, TRUE), 'admin/reports/event/'. $dblog->wid, array('html' => TRUE)),
theme('username', $dblog),
$dblog->link,
),
@@ -102,7 +102,7 @@
$rows = array();
while ($dblog = db_fetch_object($result)) {
- $rows[] = array($dblog->count, truncate_utf8(_dblog_format_message($dblog), 56, TRUE, TRUE));
+ $rows[] = array($dblog->count, drupal_truncate_chars(_dblog_format_message($dblog), 56, TRUE, TRUE));
}
if (empty($rows)) {
Index: modules/menu/menu.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/menu/menu.module,v
retrieving revision 1.159
diff -u -r1.159 menu.module
--- modules/menu/menu.module 20 Feb 2008 13:46:40 -0000 1.159
+++ modules/menu/menu.module 21 Feb 2008 01:35:29 -0000
@@ -232,7 +232,7 @@
break;
}
if ($data['link']['mlid'] != $exclude && $data['link']['hidden'] >= 0) {
- $title = $indent .' '. truncate_utf8($data['link']['title'], 30, TRUE, FALSE);
+ $title = $indent .' '. drupal_truncate_chars($data['link']['title'], 30, TRUE, FALSE);
if ($data['link']['hidden']) {
$title .= ' ('. t('disabled') .')';
}
Index: modules/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.950
diff -u -r1.950 node.module
--- modules/node/node.module 20 Feb 2008 13:46:40 -0000 1.950
+++ modules/node/node.module 21 Feb 2008 01:35:30 -0000
@@ -336,7 +336,7 @@
// sentence boundaries.
// The teaser may not be longer than maximum length specified. Initial slice.
- $teaser = truncate_utf8($body, $size);
+ $teaser = drupal_truncate_chars($body, $size);
// Store the actual length of the UTF8 string -- which might not be the same
// as $size.
Index: modules/search/search.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/search/search.module,v
retrieving revision 1.251
diff -u -r1.251 search.module
--- modules/search/search.module 20 Feb 2008 13:46:40 -0000 1.251
+++ modules/search/search.module 21 Feb 2008 01:35:31 -0000
@@ -394,7 +394,7 @@
* Helper function for array_walk in search_index_split.
*/
function _search_index_truncate(&$text) {
- $text = truncate_utf8($text, 50);
+ $text = drupal_truncate_chars($text, 50);
}
/**
@@ -1228,7 +1228,7 @@
// If we didn't find anything, return the beginning.
if (count($ranges) == 0) {
- return truncate_utf8($text, 256) .' ...';
+ return drupal_truncate_chars($text, 256) .' ...';
}
// Sort the text ranges by starting position.
Index: modules/statistics/statistics.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/statistics/statistics.module,v
retrieving revision 1.273
diff -u -r1.273 statistics.module
--- modules/statistics/statistics.module 20 Feb 2008 13:46:40 -0000 1.273
+++ modules/statistics/statistics.module 21 Feb 2008 01:35:31 -0000
@@ -301,7 +301,7 @@
*/
function _statistics_link($path, $width = 35) {
$title = drupal_get_path_alias($path);
- $title = truncate_utf8($title, $width, FALSE, TRUE);
+ $title = drupal_truncate_chars($title, $width, FALSE, TRUE);
return l($title, $path);
}