[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[44779] branches/10.x/lib

[<lph...@us...>]

Revision: 44779
          http://sourceforge.net/p/tikiwiki/code/44779
Author:   lphuberdeau
Date:     2013-02-06 21:16:45 +0000 (Wed, 06 Feb 2013)
Log Message:
-----------
[FIX]?\194?\160Prevent auto-parsing of forum posts while fetching content because a) the indexer does it b) nasty redirect plugin can break the indexing

Modified Paths:
--------------
    branches/10.x/lib/comments/commentslib.php
    branches/10.x/lib/core/Search/ContentSource/ForumPostSource.php

Modified: branches/10.x/lib/comments/commentslib.php
===================================================================
--- branches/10.x/lib/comments/commentslib.php	2013-02-06 16:26:40 UTC (rev 44778)
+++ branches/10.x/lib/comments/commentslib.php	2013-02-06 21:16:45 UTC (rev 44779)
@@ -15,6 +15,7 @@
 class Comments extends TikiLib
 {
 	public $time_control = 0;
+	private $extras = true;
 
 	/* Functions for the forums */
 	function report_post($forumId, $parentId, $threadId, $user, $reason = '')
@@ -1313,6 +1314,11 @@
 		return $ret;
 	}
 
+	public function extras_enabled($enabled)
+	{
+		$this->extras = (bool) $enabled;
+	}
+
 	// FORUMS END
 	function get_comment($id, $message_id=null, $forum_info=null)
 	{
@@ -1344,6 +1350,10 @@
 
 	function add_comments_extras(&$res, $forum_info=null)
 	{
+		if (! $this->extras) {
+			return;
+		}
+
 		// this function adds some extras to the referenced array.
 		// This array should already contain the contents of the tiki_comments table row
 		// used in $this->get_comment and $this->get_comments

Modified: branches/10.x/lib/core/Search/ContentSource/ForumPostSource.php
===================================================================
--- branches/10.x/lib/core/Search/ContentSource/ForumPostSource.php	2013-02-06 16:26:40 UTC (rev 44778)
+++ branches/10.x/lib/core/Search/ContentSource/ForumPostSource.php	2013-02-06 21:16:45 UTC (rev 44779)
@@ -30,6 +30,7 @@
 		global $prefs;
 
 		$commentslib = TikiLib::lib('comments');
+		$commentslib->extras_enabled(false);
 		$comment = $commentslib->get_comment($objectId);
 
 		$lastModification = $comment['commentDate'];
@@ -48,6 +49,8 @@
 			}
 		}
 
+		$commentslib->extras_enabled(true);
+
 		$data = array(
 			'title' => $typeFactory->sortable($comment['title']),
 			'language' => $typeFactory->identifier($forum_language),

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.