diff options
| -rw-r--r-- | BitBlogPost.php | 9 | ||||
| -rw-r--r-- | templates/crosspost.tpl | 2 | ||||
| -rw-r--r-- | templates/view_blog_post.tpl | 2 |
3 files changed, 8 insertions, 5 deletions
diff --git a/BitBlogPost.php b/BitBlogPost.php index ec09fac..be8d9ab 100644 --- a/BitBlogPost.php +++ b/BitBlogPost.php @@ -1,12 +1,12 @@ <?php /** - * $Header: /cvsroot/bitweaver/_bit_blogs/BitBlogPost.php,v 1.135 2008/11/18 23:11:20 pppspoonman Exp $ + * $Header: /cvsroot/bitweaver/_bit_blogs/BitBlogPost.php,v 1.136 2009/01/20 19:30:14 wjames5 Exp $ * * Copyright (c) 2004 bitweaver.org * All Rights Reserved. See copyright.txt for details and a complete list of authors. * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details * - * $Id: BitBlogPost.php,v 1.135 2008/11/18 23:11:20 pppspoonman Exp $ + * $Id: BitBlogPost.php,v 1.136 2009/01/20 19:30:14 wjames5 Exp $ * * Virtual base class (as much as one can have such things in PHP) for all * derived tikiwiki classes that require database access. @@ -16,7 +16,7 @@ * * @author drewslater <andrew@andrewslater.com>, spiderr <spider@steelsun.com> * - * @version $Revision: 1.135 $ $Date: 2008/11/18 23:11:20 $ $Author: pppspoonman $ + * @version $Revision: 1.136 $ $Date: 2009/01/20 19:30:14 $ $Author: wjames5 $ */ /** @@ -88,7 +88,10 @@ class BitBlogPost extends LibertyMime { $this->mPostId = $this->mInfo['post_id']; $this->mContentId = $this->mInfo['content_id']; $this->mInfo['blogs'] = $this->getBlogMemberships( $this->mContentId ); + // this is bad news right here, 'url' is wrong, standard is 'display_url' + // we should remove this now that display_url is added $this->mInfo['url'] = BitBlogPost::getDisplayUrl( $this->mContentId, $this->mInfo ); + $this->mInfo['display_url'] = BitBlogPost::getDisplayUrl( $this->mContentId, $this->mInfo ); $this->mInfo['thumbnail_url'] = BitBlogPost::getImageThumbnails( $this->mInfo ); $this->mInfo['avatar'] = liberty_fetch_thumbnail_url( array( 'storage_path' => $this->mInfo['avatar'], diff --git a/templates/crosspost.tpl b/templates/crosspost.tpl index 27c5c81..6c0c24a 100644 --- a/templates/crosspost.tpl +++ b/templates/crosspost.tpl @@ -124,7 +124,7 @@ </div> <!-- end .body --> <div class="footer"> - <a href="{$post_info.url}" rel="bookmark">{tr}Permalink{/tr}</a> + <a href="{$post_info.display_url}" rel="bookmark">{tr}Permalink{/tr}</a> {tr}referenced by{/tr} {$post_info.trackbacks_from_count} {tr}posts{/tr} | {tr}references{/tr} {$post_info.trackbacks_to_count} {tr}posts{/tr} {if $post_info.allow_comments eq 'y' and $gBitSystem->isFeatureActive( 'blog_posts_comments' )} | {$post_info.num_comments} {tr}comments{/tr} diff --git a/templates/view_blog_post.tpl b/templates/view_blog_post.tpl index 3979ecb..a6a9fea 100644 --- a/templates/view_blog_post.tpl +++ b/templates/view_blog_post.tpl @@ -105,7 +105,7 @@ </div> <!-- end .body --> <div class="footer"> - <a href="{$post_info.url}" rel="bookmark">{tr}Permalink{/tr}</a> + <a href="{$post_info.display_url}" rel="bookmark">{tr}Permalink{/tr}</a> {assign var=spacer value=TRUE} {if $post_info.trackbacks_from_count > 0} {if $spacer} • {/if} |