diff --git a/module/repo/model.php b/module/repo/model.php index c726c22366..6a7e8ab2fe 100644 --- a/module/repo/model.php +++ b/module/repo/model.php @@ -444,7 +444,7 @@ class repoModel extends model ->leftJoin(TABLE_REPOBRANCH)->alias('t3')->on('t2.id=t3.revision') ->where('1=1') ->andWhere('t1.repo')->eq($repo->id) - ->andWhere('t2.`time`')->le($revisionTime) + ->beginIF($revisionTime)->andWhere('t2.`time`')->le($revisionTime)->fi() ->andWhere('left(t2.comment, 12)')->ne('Merge branch') ->beginIF($repo->SCM != 'Subversion' and $this->cookie->repoBranch)->andWhere('t3.branch')->eq($this->cookie->repoBranch)->fi() ->beginIF($type == 'dir') @@ -461,7 +461,7 @@ class repoModel extends model $comments = $this->dao->select('DISTINCT t1.*')->from(TABLE_REPOHISTORY)->alias('t1') ->leftJoin(TABLE_REPOBRANCH)->alias('t2')->on('t1.id=t2.revision') ->where('t1.repo')->eq($repoID) - ->andWhere('t1.`time`')->le($revisionTime) + ->beginIF($revisionTime)->andWhere('t1.`time`')->le($revisionTime)->fi() ->andWhere('left(t1.comment, 12)')->ne('Merge branch') ->beginIF($repo->SCM != 'Subversion' and $this->cookie->repoBranch)->andWhere('t2.branch')->eq($this->cookie->repoBranch)->fi() ->beginIF($entry != '/' and !empty($entry))->andWhere('t1.id')->in($historyIdList)->fi()