r1231: Modified patches from Terry that fix SQL and encoding errors in syndicate.php

diff --git a/docs/changes.txt b/docs/changes.txt
index 482168830bcb67b6ce65c3b0b1f071f7d68a0d76..88f61d05204775295d1026dfc22a7bf8c429125a 100644 (file)
--- 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 2c46c1fba0eab9491d4673dad9f2690d20fb1773..7ec90edb1fbe2187d83352b42b11c42717b4f780 100644 (file)
--- 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>