Don't show non-comments in comments API (#2001)

1 files changed, 2 insertions, 0 deletions

diff --git a/models/issue_comment.go b/models/issue_comment.go
index 91d8551518..ead3f1bed3 100644
--- a/models/issue_comment.go
+++ b/models/issue_comment.go
@@ -572,6 +572,7 @@ func getCommentsByIssueIDSince(e Engine, issueID, since int64) ([]*Comment, erro
 	comments := make([]*Comment, 0, 10)
 	sess := e.
 		Where("issue_id = ?", issueID).
+		Where("type = ?", CommentTypeComment).
 		Asc("created_unix")
 	if since > 0 {
 		sess.And("updated_unix >= ?", since)
@@ -582,6 +583,7 @@ func getCommentsByIssueIDSince(e Engine, issueID, since int64) ([]*Comment, erro
 func getCommentsByRepoIDSince(e Engine, repoID, since int64) ([]*Comment, error) {
 	comments := make([]*Comment, 0, 10)
 	sess := e.Where("issue.repo_id = ?", repoID).
+		Where("comment.type = ?", CommentTypeComment).
 		Join("INNER", "issue", "issue.id = comment.issue_id").
 		Asc("comment.created_unix")
 	if since > 0 {

path: root/models/issue_comment.go

<?php

/**
* ownCloud status page. Useful if you want to check from the outside if an ownCloud installation exists
*
* @author Frank Karlitschek
* @copyright 2012 Frank Karlitschek frank@owncloud.org
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
* License as published by the Free Software Foundation; either
* version 3 of the License, or any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
*
* You should have received a copy of the GNU Affero General Public
* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
*
*/

$RUNTIME_NOAPPS = true; //no apps, yet

try {

	require_once 'lib/base.php';

	if(OC_Config::getValue('installed')==1) $installed='true'; else $installed='false';
	$values=array(
		'installed'=>$installed,
		'version'=>implode('.', OC_Util::getVersion()),
		'versionstring'=>OC_Util::getVersionString(),
		'edition'=>OC_Util::getEditionString());

	echo(json_encode($values));

} catch (Exception $ex) {
	OC_Response::setStatus(OC_Response::STATUS_INTERNAL_SERVER_ERROR);
	\OCP\Util::writeLog('remote', $ex->getMessage(), \OCP\Util::FATAL);
}