From 34a0ea4ec2b997a97ac79f8e8ed003980ae5f043 Mon Sep 17 00:00:00 2001
From: Robert Sesek <rsesek@bluestatic.org>
Date: Wed, 4 Oct 2006 05:40:05 +0000
Subject: [PATCH] r1231: Modified patches from Terry that fix SQL and encoding
errors in syndicate.php
---
docs/changes.txt | 2 ++
syndicate.php | 6 +++---
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/docs/changes.txt b/docs/changes.txt
index 4821688..88f61d0 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -1,6 +1,8 @@
1.1.1
===============================
- Registration email functions do not work because they are not ISSO2/Mail compatible [register.php]
+- Removed TABLE_PREFIX-related SQL errors in syndicate.php
+- Use the correct language variable key for exporting the XML encoding in syndicate.php
1.1.0
===============================
diff --git a/syndicate.php b/syndicate.php
index 2c46c1f..7ec90ed 100644
--- a/syndicate.php
+++ b/syndicate.php
@@ -38,8 +38,8 @@ $lastupdated = 0;
$buglist = array();
$bugs_fetch = $db->query("
SELECT bug.*, comment.comment_parsed
- FROM " . TABLE_PREFIX . "bug
- LEFT JOIN " . TABLE_PREFIX . "comment
+ FROM " . TABLE_PREFIX . "bug AS bug
+ LEFT JOIN " . TABLE_PREFIX . "comment AS comment
ON (bug.initialreport = comment.commentid)
WHERE bug.product IN (" . fetch_on_bits('canviewbugs', fetch_guest_user()) . ")
AND (!bug.hidden OR (bug.hidden AND bug.product IN (" . fetch_on_bits('canviewhidden', fetch_guest_user()) . ")))
@@ -88,7 +88,7 @@ while ($bug = $db->fetch_array($bugs_fetch))
$lastupdated = $bug["$timestamp"];
}
-echo '<?xml version="1.0" encoding="' . $language['encoding'] . '"?>
+echo '<?xml version="1.0" encoding="' . $language['charset'] . '"?>
<feed xmlns="http://www.w3.org/2005/Atom">
<title>' . sprintf(_('%1$s Syndication Feed'), $bugsys->options['trackertitle']) . '</title>
--
2.43.5