Fixing posts

Author: stygiansabyss

src/models/Forum/Post.php

@@ -63,7 +63,7 @@ class Forum_Post extends Forum
 		'history'     => array('hasMany',	'Forum_Post_Edit',		'foreignKey' => 'forum_post_id', 'orderBy' => array('created_at', 'desc')),
 		'status'      => array('hasOne',	'Forum_Post_Status',	'foreignKey' => 'forum_post_id'),
 		'moderations' => array('morphMany',	'Forum_Moderation',		'name'       => 'resource'),
-		'morph'       => array('morphTo', 'withTrashed'),
+		'morph'       => array('morphTo'),
 	);
 
 	/********************************************************************

src/models/Forum/Reply.php

@@ -62,7 +62,7 @@ class Forum_Reply extends Forum
 		'roll'        => array('hasOne',	'Forum_Reply_Roll',		'foreignKey' => 'forum_reply_id'),
 		'history'     => array('hasMany',	'Forum_Reply_Edit',		'foreignKey' => 'forum_reply_id', 'orderBy' => array('created_at', 'desc')),
 		'moderations' => array('morphMany',	'Forum_Moderation',		'name'       => 'resource'),
-		'morph'       => array('morphTo', 'withTrashed'),
+		'morph'       => array('morphTo'),
 		'quote'       => array('morphTo'),
 	);
 

src/services/Forum/ForumPost.php

@@ -67,15 +67,12 @@ public function setRepliesPerPage($count)
 	public function setDefaultData()
 	{
 		if ($this->type == 'IMAGE') {
-			$replyTypes= \Forum_Reply_Type::where('keyName', 'IMAGE')->get();
-			$this->replyTypes = \CoreView::arrayToSelect($replyTypes , 'id', 'name', false);
+			$this->replyTypes= \Forum_Reply_Type::where('keyName', 'IMAGE')->get()->toSelectArray(false);
 		} else {
-			$replyTypes       = \Forum_Reply_Type::orderByNameAsc()->remember(60)->get();
-			$this->replyTypes = \CoreView::arrayToSelect($replyTypes , 'id', 'name', 'Select Reply Type');
+			$this->replyTypes       = \Forum_Reply_Type::orderByNameAsc()->get()->toSelectArray('Select a Reply Type');
 		}
 
-		$statuses       = \Forum_Support_Status::remember(60)->get();
-		$this->statuses = \CoreView::arrayToSelect($statuses, 'id', 'name', 'Select a Status');
+		$this->statuses       = \Forum_Support_Status::all()->toSelectArray('Select a status');
 
 		return $this;
 	}

src/views/forum/post/components/postcontents.blade.php

@@ -1,6 +1,10 @@
 								<!-- Start Title and Details -->
 								{{ $post->icon }}
-								<strong>{{ HTML::link('forum/post/view/'. $post->keyName .'#reply:'. $post->id, $post->name, array('name' => 'reply:'. $post->id, 'rel' => 'nofollow')) }}</strong>
+								@if (getRootClass($post) == 'Forum_Post')
+									<strong>{{ HTML::link('forum/post/view/'. $post->id .'/'. $details->currentPage, $post->name, array('name' => 'reply:'. $post->id, 'rel' => 'nofollow')) }}</strong>
+								@else
+									<strong>{{ HTML::link('forum/post/view/'. $post->post->id .'/'. $details->currentPage .'#reply:'. $post->id, $post->name, array('name' => 'reply:'. $post->id, 'rel' => 'nofollow')) }}</strong>
+								@endif
 								@if ($post->forum_post_type_id == Forum_Post::TYPE_APPLICATION && $post->approvedFlag == 0)
 									<small class="label label-important">Unapproved</small>
 								@endif