From: garvinhicking <garvinhicking>
Date: Wed, 21 Sep 2005 14:37:09 +0000 (+0000)
Subject: Fix missing display of extended data. Mea maxima culpa.
X-Git-Tag: 0.9~131
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=a7eaef6b5d3aca1592f845b6a6d19d24ef451c06;p=s9y.git

Fix missing display of extended data. Mea maxima culpa.
---

diff --git a/docs/NEWS b/docs/NEWS
index 1b494d3..5be0492 100644
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -3,6 +3,8 @@
 Version 0.9 ()
 ------------------------------------------------------------------------
 
+    * Fix JS errors in admin comment overview for IE6 (garvinhicking)
+
     * Fix showing any entry-id related sidebar plugins, when a selected
       entry is not visible (permissions/drafts/...) by unsetting the
       global $serendipity['GET']['id'] in that case. (garvinhicking)
diff --git a/include/admin/comments.inc.php b/include/admin/comments.inc.php
index 0e012f5..d9ea092 100644
--- a/include/admin/comments.inc.php
+++ b/include/admin/comments.inc.php
@@ -366,7 +366,7 @@ foreach ($sql as $rs) {
           <a href="#c<?php echo $rs['id'] ?>" onclick="toggle(<?php echo $rs['id'] ?>); return false;" title="<?php echo VIEW; ?>" class="serendipityIconLink"><img src="<?php echo serendipity_getTemplateFile('admin/img/zoom.png'); ?>" alt="<?php echo VIEW; ?>" /><span id="<?php echo $rs['id'] ?>_text"><?php echo VIEW ?></span></a>
 <?php } ?>
           <a href="?serendipity[action]=admin&amp;serendipity[adminModule]=comments&amp;serendipity[adminAction]=edit&amp;serendipity[id]=<?php echo $rs['id'] ?>&amp;serendipity[entry_id]=<?php echo $rs['entry_id'] ?>" title="<?php echo EDIT; ?>" class="serendipityIconLink"><img src="<?php echo serendipity_getTemplateFile('admin/img/edit.png'); ?>" alt="<?php echo EDIT; ?>" /><?php echo EDIT ?></a>
-          <a href="?serendipity[action]=admin&amp;serendipity[adminModule]=comments&amp;serendipity[adminAction]=delete&amp;serendipity[id]=<?php echo $rs['id'] ?>&amp;serendipity[entry_id]=<?php echo $rs['entry_id'] ?>" onclick="return confirm('<?php echo sprintf(COMMENT_DELETE_CONFIRM, $rs['id'], htmlspecialchars($rs['author'])) ?>')" title="<?php echo DELETE ?>" class="serendipityIconLink"><img src="<?php echo serendipity_getTemplateFile('admin/img/delete.png'); ?>" alt="<?php echo DELETE; ?>" /><?php echo DELETE ?></a>
+          <a href="?serendipity[action]=admin&amp;serendipity[adminModule]=comments&amp;serendipity[adminAction]=delete&amp;serendipity[id]=<?php echo $rs['id'] ?>&amp;serendipity[entry_id]=<?php echo $rs['entry_id'] ?>" onclick='return confirm("<?php echo sprintf(COMMENT_DELETE_CONFIRM, $rs['id'], htmlspecialchars($rs['author'])) ?>")' title="<?php echo DELETE ?>" class="serendipityIconLink"><img src="<?php echo serendipity_getTemplateFile('admin/img/delete.png'); ?>" alt="<?php echo DELETE; ?>" /><?php echo DELETE ?></a>
     </td>
 </tr>
 <tr>
diff --git a/include/functions_entries.inc.php b/include/functions_entries.inc.php
index d55124a..94ad65e 100644
--- a/include/functions_entries.inc.php
+++ b/include/functions_entries.inc.php
@@ -356,7 +356,8 @@ function serendipity_fetchEntry($key, $val, $full = true, $fetchDrafts = 'false'
                             {$cond['and']}
                      LIMIT  1";
 
-    $ret = serendipity_db_query($querystring, true);
+    $ret = serendipity_db_query($querystring, true, 'assoc');
+
     if (is_array($ret)) {
         $ret['categories'] = serendipity_fetchEntryCategories($ret['id']);
         $ret['properties'] = serendipity_fetchEntryProperties($ret['id']);
diff --git a/include/genpage.inc.php b/include/genpage.inc.php
index ba50bd5..c71f88b 100644
--- a/include/genpage.inc.php
+++ b/include/genpage.inc.php
@@ -28,10 +28,10 @@ if ($serendipity['smarty_raw_mode']) {
         // User wants to read the diary
         case 'read':
             if (isset($serendipity['GET']['id'])) {
-                $entry = serendipity_fetchEntry('id', $serendipity['GET']['id']);
+                $entry = array(serendipity_fetchEntry('id', $serendipity['GET']['id']));
                 if (!is_array($entry) || count($entry) < 1) {
                     unset($serendipity['GET']['id']);
-                    $entry = array();
+                    $entry = array(array());
                 }
 
                 serendipity_printEntries($entry, 1);