Update of /cvsroot/php-blog/serendipity/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32648/include
Modified Files:
functions_entries.inc.php
Log Message:
- Separate categories by a ", "
- Put link generation for each category into the core
- Don't use {section}
- comments_messagestack must always be an array!
Index: functions_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_entries.inc.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- functions_entries.inc.php 23 Dec 2004 20:46:34 -0000 1.34
+++ functions_entries.inc.php 30 Dec 2004 22:41:27 -0000 1.35
@@ -574,6 +574,10 @@
$entry['link_viewmode_linear'] = $serendipity['serendipityHTTPPath'] . $serendipity['indexFile'] .'?url='. $entry['commURL'] .'&serendipity[cview]='. VIEWMODE_LINEAR;
$entry['link_username'] = serendipity_rewriteURL(PATH_AUTHORS .'/'. serendipity_makePermalink(PERM_AUTHORS, array('id' => $entry['authorid'], 'title' => $entry['username'])));
+ foreach ( $entry['categories'] as $k => $v ) {
+ $entry['categories'][$k]['category_link'] = serendipity_rewriteURL(PATH_CATEGORIES . '/' . serendipity_makePermalink(PERM_CATEGORIES, array('id' => $entry['categories'][$k]['categoryid'], 'title' => $entry['categories'][$k]['category_name'])));
+ }
+
if (strlen($entry['extended'])) {
$entry['has_extended'] = true;
}
@@ -611,7 +615,7 @@
if (isset($serendipity['GET']['id'])) {
$serendipity['smarty']->assign(
array(
- 'comments_messagestack' => (isset($serendipity['messagestack']['comments']) ? (array)$serendipity['messagestack']['comments'] : false),
+ 'comments_messagestack' => (isset($serendipity['messagestack']['comments']) ? (array)$serendipity['messagestack']['comments'] : array()),
'is_comment_added' => (isset($serendipity['GET']['csuccess']) && $serendipity['GET']['csuccess'] == 'true' ? true: false),
'is_comment_moderate' => (isset($serendipity['GET']['csuccess']) && $serendipity['GET']['csuccess'] == 'moderate' ? true: false)
)
|
