X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=actions%2Ftag.php;h=75bf6c8bfb76267ed56850926e754f689ecfd4dc;hb=3a246c17266d562e0510e5a332009dcfda43c1c7;hp=8b5548e45809435115ee3ad26f9faa54087e79ab;hpb=fc7f32e35d9c77037921fb4a6e40b7ca32baeb79;p=quix0rs-gnu-social.git

diff --git a/actions/tag.php b/actions/tag.php
index 8b5548e458..75bf6c8bfb 100644
--- a/actions/tag.php
+++ b/actions/tag.php
@@ -98,9 +98,9 @@ class TagAction extends StreamAction {
 		#Add the aggregated columns...
 		$tags->selectAdd('max(notice_id) as last_notice_id');
 		if(common_config('db','type')=='pgsql') {
-			$calc='sum(exp(-extract(epoch from (now()-created))/%f)) as weight';
+			$calc='sum(exp(-extract(epoch from (now()-created))/%s)) as weight';
 		} else {
-			$calc='sum(exp(-(now() - created)/%f)) as weight';
+			$calc='sum(exp(-(now() - created)/%s)) as weight';
 		}
 		$tags->selectAdd(sprintf($calc, common_config('tag', 'dropoff')));
 		$tags->groupBy('tag');
@@ -159,23 +159,20 @@ class TagAction extends StreamAction {
 
 	function show_notices($tag) {
 
-		$notices = Notice_tag::getStream($tag, (($page-1)*NOTICES_PER_PAGE), NOTICES_PER_PAGE + 1);
+		$cnt = 0;
 		
-		if ($cnt > 0) {
+		$page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
+
+		$notice = Notice_tag::getStream($tag, (($page-1)*NOTICES_PER_PAGE), NOTICES_PER_PAGE + 1);
+
+		if ($notice) {
 			common_element_start('ul', array('id' => 'notices'));
-			for ($i = 0; $i < min($cnt, NOTICES_PER_PAGE); $i++) {
-				if ($tags->fetch()) {
-					$notice = new Notice();
-					$notice->id = $tags->notice_id;
-					$result = $notice->find(true);
-					if (!$result) {
-						continue;
-					}
-					$this->show_notice($notice);
-				} else {
-					// shouldn't happen!
+			while ($notice->fetch()) {
+				$cnt++;
+				if ($cnt > NOTICES_PER_PAGE) {
 					break;
 				}
+				$this->show_notice($notice);
 			}
 			common_element_end('ul');
 		}