summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--modules/locale.module2
-rw-r--r--modules/locale/locale.module2
-rw-r--r--modules/system.module38
-rw-r--r--modules/system/system.module38
4 files changed, 40 insertions, 40 deletions
diff --git a/modules/locale.module b/modules/locale.module
index 99f374d36..38c0ee681 100644
--- a/modules/locale.module
+++ b/modules/locale.module
@@ -103,7 +103,7 @@ function locale_edit($lid) {
$result = db_query("SELECT * FROM locales WHERE lid = '$lid'");
if ($translation = db_fetch_object($result)) {
- $form .= form_item(t("Original text"), wordwrap(htmlspecialchars($translation->string)));
+ $form .= form_item(t("Original text"), wordwrap(drupal_specialchars($translation->string)));
foreach ($languages as $code=>$language) {
$form .= (strlen($translation->string) > 30) ? form_textarea($language, $code, $translation->$code, 50, 10) : form_textfield($language, $code, $translation->$code, 50, 128);
diff --git a/modules/locale/locale.module b/modules/locale/locale.module
index 99f374d36..38c0ee681 100644
--- a/modules/locale/locale.module
+++ b/modules/locale/locale.module
@@ -103,7 +103,7 @@ function locale_edit($lid) {
$result = db_query("SELECT * FROM locales WHERE lid = '$lid'");
if ($translation = db_fetch_object($result)) {
- $form .= form_item(t("Original text"), wordwrap(htmlspecialchars($translation->string)));
+ $form .= form_item(t("Original text"), wordwrap(drupal_specialchars($translation->string)));
foreach ($languages as $code=>$language) {
$form .= (strlen($translation->string) > 30) ? form_textarea($language, $code, $translation->$code, 50, 10) : form_textfield($language, $code, $translation->$code, 50, 128);
diff --git a/modules/system.module b/modules/system.module
index 569af7c32..801daa819 100644
--- a/modules/system.module
+++ b/modules/system.module
@@ -134,25 +134,25 @@ function system_view_general() {
$output .= "<h3>". t("Character encoding settings") ."</h3>\n";
// charset settings
- $charsets = array("iso-8859-1",
- "iso-8859-2",
- "iso-8859-3",
- "iso-8859-4",
- "iso-8859-5",
- "iso-8859-6",
- "iso-8859-7",
- "iso-8859-8",
- "iso-8859-8-i",
- "iso-8859-9",
- "utf-8",
- "utf-16",
- "utf-16be",
- "euc-kr",
- "koi8-r",
- "ks_c_5601-1987",
- "tis-620",
- "iso-2022-kr",
- "us-ascii");
+ $charsets = array("iso-8859-1" => "iso-8859-1",
+ "iso-8859-2" => "iso-8859-2",
+ "iso-8859-3" => "iso-8859-3",
+ "iso-8859-4" => "iso-8859-4",
+ "iso-8859-5" => "iso-8859-5",
+ "iso-8859-6" => "iso-8859-6",
+ "iso-8859-7" => "iso-8859-7",
+ "iso-8859-8" => "iso-8859-8",
+ "iso-8859-8-i" => "iso-8859-8-i",
+ "iso-8859-9" => "iso-8859-9",
+ "utf-8" => "utf-8",
+ "utf-16" => "utf-16",
+ "utf-16be" => "utf-16be",
+ "euc-kr" => "euc-kr",
+ "koi8-r" => "koi8-r",
+ "ks_c_5601-1987" => "ks_c_5601-1987",
+ "tis-620" => "tis-620",
+ "iso-2022-kr" => "iso-2022-kr",
+ "us-ascii" => "us-ascii");
$output .= form_select(t("Character set"), "site_charset", variable_get("site_charset", "iso-8859-1"), $charsets, t("Select the character set (charset) used across your site. This will affect the content-type tag in web pages and the XML declarations in RSS feeds, among other things. You probably only need to change this if you need support for languages with non-ASCII characters like Korean, Polish, etc."));
return $output;
}
diff --git a/modules/system/system.module b/modules/system/system.module
index 569af7c32..801daa819 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -134,25 +134,25 @@ function system_view_general() {
$output .= "<h3>". t("Character encoding settings") ."</h3>\n";
// charset settings
- $charsets = array("iso-8859-1",
- "iso-8859-2",
- "iso-8859-3",
- "iso-8859-4",
- "iso-8859-5",
- "iso-8859-6",
- "iso-8859-7",
- "iso-8859-8",
- "iso-8859-8-i",
- "iso-8859-9",
- "utf-8",
- "utf-16",
- "utf-16be",
- "euc-kr",
- "koi8-r",
- "ks_c_5601-1987",
- "tis-620",
- "iso-2022-kr",
- "us-ascii");
+ $charsets = array("iso-8859-1" => "iso-8859-1",
+ "iso-8859-2" => "iso-8859-2",
+ "iso-8859-3" => "iso-8859-3",
+ "iso-8859-4" => "iso-8859-4",
+ "iso-8859-5" => "iso-8859-5",
+ "iso-8859-6" => "iso-8859-6",
+ "iso-8859-7" => "iso-8859-7",
+ "iso-8859-8" => "iso-8859-8",
+ "iso-8859-8-i" => "iso-8859-8-i",
+ "iso-8859-9" => "iso-8859-9",
+ "utf-8" => "utf-8",
+ "utf-16" => "utf-16",
+ "utf-16be" => "utf-16be",
+ "euc-kr" => "euc-kr",
+ "koi8-r" => "koi8-r",
+ "ks_c_5601-1987" => "ks_c_5601-1987",
+ "tis-620" => "tis-620",
+ "iso-2022-kr" => "iso-2022-kr",
+ "us-ascii" => "us-ascii");
$output .= form_select(t("Character set"), "site_charset", variable_get("site_charset", "iso-8859-1"), $charsets, t("Select the character set (charset) used across your site. This will affect the content-type tag in web pages and the XML declarations in RSS feeds, among other things. You probably only need to change this if you need support for languages with non-ASCII characters like Korean, Polish, etc."));
return $output;
}