merge revisions 2121, 2122 and 2123 from trunk to branch-1_7

- function str2url is compatible with utf-8
- removed some old code (useless)
- remove str_translate_to_ascii7bits and lang_table_translate_ascii7bits
- mail subject and address names can contain accentuated characters

git-svn-id: http://piwigo.org/svn/branches/branch-1_7@2125 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices
2007-10-08 23:13:56 +00:00
parent d446a221cd
commit a15cc194b9
5 changed files with 207 additions and 629 deletions
+2 -7
View File
@@ -105,7 +105,7 @@ foreach ($pictures as $row)
'CLASS'=> set_span_class($row['hit']) . ' nb-hits',
)
);
}
if ($conf['show_thumbnail_caption'])
@@ -134,11 +134,6 @@ foreach ($pictures as $row)
}
break;
}
case 'search' :
{
$name = replace_search($name, $page['search']);
break;
}
}
$template->assign_block_vars(
@@ -161,7 +156,7 @@ SELECT COUNT(*) AS nb_comments
$template->assign_block_vars(
'thumbnails.line.thumbnail.nb_comments',
array(
'NB_COMMENTS'=> l10n_dec('%d comment', '%d comments',
'NB_COMMENTS'=> l10n_dec('%d comment', '%d comments',
$row['nb_comments']),
'CLASS'=> set_span_class($row['nb_comments']) . ' nb-comments',
)