summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven Wittens <steven@10.no-reply.drupal.org>2003-12-30 06:41:24 +0000
committerSteven Wittens <steven@10.no-reply.drupal.org>2003-12-30 06:41:24 +0000
commitf6cae0943963e13be880e16c29f4e2560d9a030d (patch)
tree0ab85fb340455c830cd543f97595d01cc9dc7531
parent205aa25e9b395a47b2995011739307070f1090c9 (diff)
downloadbrdo-f6cae0943963e13be880e16c29f4e2560d9a030d.tar.gz
brdo-f6cae0943963e13be880e16c29f4e2560d9a030d.tar.bz2
- Specify default XML encoding for not-so-well-formed files
(sorry last commit, I promise :P)
-rw-r--r--modules/aggregator.module1
-rw-r--r--modules/aggregator/aggregator.module1
-rw-r--r--modules/import.module1
3 files changed, 3 insertions, 0 deletions
diff --git a/modules/aggregator.module b/modules/aggregator.module
index 0dbde5585..e1bce4967 100644
--- a/modules/aggregator.module
+++ b/modules/aggregator.module
@@ -326,6 +326,7 @@ function import_refresh($feed) {
}
// extract the XML file's encoding (the XML parser in PHP4 doesn't do this by itself):
+ $encoding = 'utf-8';
if (ereg('^<\?xml[^>]+encoding="([^"]+)"', $data, $match)) {
$encoding = $match[1];
}
diff --git a/modules/aggregator/aggregator.module b/modules/aggregator/aggregator.module
index 0dbde5585..e1bce4967 100644
--- a/modules/aggregator/aggregator.module
+++ b/modules/aggregator/aggregator.module
@@ -326,6 +326,7 @@ function import_refresh($feed) {
}
// extract the XML file's encoding (the XML parser in PHP4 doesn't do this by itself):
+ $encoding = 'utf-8';
if (ereg('^<\?xml[^>]+encoding="([^"]+)"', $data, $match)) {
$encoding = $match[1];
}
diff --git a/modules/import.module b/modules/import.module
index 0dbde5585..e1bce4967 100644
--- a/modules/import.module
+++ b/modules/import.module
@@ -326,6 +326,7 @@ function import_refresh($feed) {
}
// extract the XML file's encoding (the XML parser in PHP4 doesn't do this by itself):
+ $encoding = 'utf-8';
if (ereg('^<\?xml[^>]+encoding="([^"]+)"', $data, $match)) {
$encoding = $match[1];
}