Fix missing display of extended data. Mea maxima culpa.

diff --git a/docs/NEWS b/docs/NEWS
index 1b494d3dbd7ad20a80a55c526b778b5e3e3d90d2..5be0492420123a7ec852b04d149339af58021a76 100644 (file)
--- 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 0e012f52a6d2b203a1ce9240bfe49486fb1d339f..d9ea09282ee5ec0f2f83094b80b53ef55fe00ae6 100644 (file)
--- 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 d55124af52f27a6532d3821e3ecc422df1a13ec5..94ad65e3d22784a38081dc67f4102b4dbf3b01cd 100644 (file)
--- 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 ba50bd55ff073398367a8df5dc55d4fff52c5e39..c71f88b2a59b6185720e27eefd607860c6dafa8c 100644 (file)
--- 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);