1 files changed, 22 insertions, 16 deletions

diff --git a/includes/display_bitblog_inc.php b/includes/display_bitblog_inc.php
index 19c70eb..a806fc9 100644..100755
--- a/includes/display_bitblog_inc.php
+++ b/includes/display_bitblog_inc.php
@@ -12,10 +12,13 @@
 /**
  * required setup
  */
-$gBitSystem->verifyPackage( 'blogs' );
 
-require_once( BLOGS_PKG_CLASS_PATH.'BitBlog.php' );
-require_once( BLOGS_PKG_INCLUDE_PATH.'lookup_blog_inc.php');
+namespace Bitweaver\Liberty;
+use Bitweaver\KernelTools;
+use Bitweaver\Blogs\BitBlogPost;
+require_once BLOGS_PKG_INCLUDE_PATH.'lookup_blog_inc.php';
+
+$gBitSystem->verifyPackage( 'blogs' );
 
 $displayHash = array( 'perm_name' => $gContent->mViewContentPerm );
 $gContent->invokeServices( 'content_display_function', $displayHash );
@@ -30,7 +33,7 @@ if( isset($_REQUEST['user_id']) && !isset( $_REQUEST['blog_id'] ) ) {
 
 if( !$gContent->isValid() ) {
 	$gBitSystem->setHttpStatus( 404 );
-	$gBitSystem->fatalError( tra( 'No blog indicated' ));
+	$gBitSystem->fatalError( KernelTools::tra( 'No blog indicated' ));
 }
 
 $gContent->verifyViewPermission();
@@ -51,18 +54,18 @@ if( !$gContent->hasUpdatePermission() ) {
 $now = $gBitSystem->getUTCTime();
 
 $blogPost = new BitBlogPost();
-$listHash = array();
+$listHash = $_REQUEST;
 $listHash['blog_id'] = $gContent->getField( 'blog_id' );
-$listHash['parse_data'] = TRUE;
+$listHash['parse_data'] = true;
 $listHash['max_records'] = $gContent->getField( 'max_posts' );
-$listHash['load_num_comments'] = TRUE;
+$listHash['load_num_comments'] = true;
 $blogPosts = $blogPost->getList( $listHash );
 if( count( $blogPosts ) ) {
 	// If there're more records then assign next_offset
-	$gBitSmarty->assignByRef('blogPosts', $blogPosts);
-	$gBitSmarty->assign( 'listInfo', $listHash );
+	$gBitSmarty->assign('blogPosts', $blogPosts);
+	$gBitSmarty->assign( 'listInfo', $listHash['listInfo'] );
 } elseif( $gContent->hasPostPermission() ) {
-	bit_redirect( BLOGS_PKG_URL.'post.php?blog_id='.$gContent->getField( 'blog_id' ) );
+	KernelTools::bit_redirect( BLOGS_PKG_URL.'post.php?blog_id='.$gContent->getField( 'blog_id' ) );
 }
 
 if( $gBitSystem->isFeatureActive( 'users_watches' ) ) {
@@ -70,7 +73,7 @@ if( $gBitSystem->isFeatureActive( 'users_watches' ) ) {
 		if ($_REQUEST['watch_action'] == 'add') {
 			$blogPost = new BitBlogPost( $_REQUEST['watch_object'] );
 			if( $blogPost->load() ) {
-				$gBitUser->storeWatch( $_REQUEST['watch_event'], $_REQUEST['watch_object'], tra('blog'), $blogPost->getTitle(), $blogPost->getDisplayUrl() );
+				$gBitUser->storeWatch( $_REQUEST['watch_event'], $_REQUEST['watch_object'], KernelTools::tra('blog'), $blogPost->getTitle(), $blogPost->getDisplayUrl() );
 			}
 		} else {
 			$gBitUser->expungeWatch( $_REQUEST['watch_event'], $_REQUEST['watch_object'] );
@@ -85,12 +88,15 @@ if( $gBitSystem->isFeatureActive( 'users_watches' ) ) {
 }
 
 $gBitSmarty->assign('descriptionLength', $gBitSystem->getConfig( 'blog_posts_description_length', 500 ) );
-$gBitSmarty->assign('showDescriptionsOnly', TRUE);
+$gBitSmarty->assign('showDescriptionsOnly', true);
 
 if ( $gBitSystem->isFeatureActive( 'blog_ajax_more' ) && $gBitThemes->isJavascriptEnabled() ){
-	$gBitSmarty->assign('ajax_more', TRUE);
-	$gBitThemes->loadAjax( 'mochikit', array( 'Iter.js', 'DOM.js', 'Style.js', 'Color.js', 'Position.js', 'Visual.js' ) );
+	$gBitSmarty->assign('ajax_more', true);
+	$gBitThemes->loadAjax( 'mochikit', [ 'Iter.js', 'DOM.js', 'Style.js', 'Color.js', 'Position.js', 'Visual.js' ] );
+}
+
+if( $gContent->isValid() ) {
+	$gBitSystem->setCanonicalLink( $gContent->getDisplayUrl() );
 }
 // Display the template
-$gBitSystem->display( 'bitpackage:blogs/view_blog.tpl', $gContent->getTitle() , array( 'display_mode' => 'display' ));
-?>
+$gBitSystem->display( 'bitpackage:blogs/view_blog.tpl', $gContent->getTitle() , [ 'display_mode' => 'display' ] );
\ No newline at end of file