[php-blog-cvs] serendipity/include functions_entries.inc.php,1.39,1.40

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10736/include

Modified Files:
	functions_entries.inc.php 
Log Message:
* fix array key name
* show trackback/comment links in full entry view as well. template logic should define whether to not display the links, because otherwise a user needs to return to overview to see links to trackbacks.


Index: functions_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_entries.inc.php,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- functions_entries.inc.php	8 Jan 2005 23:10:42 -0000	1.39
+++ functions_entries.inc.php	10 Jan 2005 10:10:19 -0000	1.40
@@ -566,8 +566,8 @@
             $entry['allow_comments']         = serendipity_db_bool($entry['allow_comments']);
             $entry['moderate_comments']      = serendipity_db_bool($entry['moderate_comments']);
             $entry['viewmode']               = ($serendipity['GET']['cview'] == VIEWMODE_LINEAR ? VIEWMODE_LINEAR : VIEWMODE_THREADED);
-            $entry['link_popup_comments']    = $serendipity['$serendipityHTTPPath'] .'comment.php?serendipity[entry_id]='. $entry['id'] .'&serendipity[type]=comments';
-            $entry['link_popup_trackbacks']  = $serendipity['$serendipityHTTPPath'] .'comment.php?serendipity[entry_id]='. $entry['id'] .'&serendipity[type]=trackbacks';
+            $entry['link_popup_comments']    = $serendipity['serendipityHTTPPath'] .'comment.php?serendipity[entry_id]='. $entry['id'] .'&serendipity[type]=comments';
+            $entry['link_popup_trackbacks']  = $serendipity['serendipityHTTPPath'] .'comment.php?serendipity[entry_id]='. $entry['id'] .'&serendipity[type]=trackbacks';
             $entry['link_edit']              = $serendipity['baseURL'] .'serendipity_admin.php?serendipity[action]=admin&serendipity[adminModule]=entries&serendipity[adminAction]=edit&serendipity[id]='. $entry['id'];
             $entry['link_trackback']         = $serendipity['baseURL'] .'comment.php?type=trackback&entry_id='. $entry['id'];
             $entry['link_rdf']               = serendipity_rewriteURL(PATH_FEEDS . '/ei_'. $entry['id'] .'.rdf');
@@ -587,12 +587,12 @@
                 $entry['is_extended']       = true;
             }
 
-            if (!isset($serendipity['GET']['id']) && (serendipity_db_bool($entry['allow_comments']) || !isset($entry['allow_comments']) || $entry['comments'] > 0)) {
+            if (serendipity_db_bool($entry['allow_comments']) || !isset($entry['allow_comments']) || $entry['comments'] > 0) {
                 $entry['has_comments']      = true;
                 $entry['label_comments']    = $entry['comments'] == 1 ? COMMENT : COMMENTS;
             }
 
-            if (!isset($serendipity['GET']['id']) && (serendipity_db_bool($entry['allow_comments']) || !isset($entry['allow_comments']) || $entry['trackbacks'] > 0)) {
+            if (serendipity_db_bool($entry['allow_comments']) || !isset($entry['allow_comments']) || $entry['trackbacks'] > 0) {
                 $entry['has_trackbacks']    = true;
                 $entry['label_trackbacks']  = $entry['trackbacks'] == 1 ? TRACKBACK : TRACKBACKS;
             }