aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-07-01 19:17:21 -0700
committerfriendica <info@friendica.com>2012-07-01 19:17:21 -0700
commite2a725ff986f80e45dac842db51fcc007a9683d9 (patch)
treed3132f7b510e7af91ea2f2d4a89616804423389f
parentdd71f9446b05274550ebcb3ce4773762832084e3 (diff)
downloadvolse-hubzilla-e2a725ff986f80e45dac842db51fcc007a9683d9.tar.gz
volse-hubzilla-e2a725ff986f80e45dac842db51fcc007a9683d9.tar.bz2
volse-hubzilla-e2a725ff986f80e45dac842db51fcc007a9683d9.zip
pagination start off by one
-rw-r--r--boot.php2
-rw-r--r--mod/message.php4
2 files changed, 4 insertions, 2 deletions
diff --git a/boot.php b/boot.php
index 26593bc8f..a6fa8e26c 100644
--- a/boot.php
+++ b/boot.php
@@ -442,7 +442,7 @@ if(! class_exists('App')) {
$this->pager['page'] = ((x($_GET,'page') && intval($_GET['page']) > 0) ? intval($_GET['page']) : 1);
$this->pager['itemspage'] = 50;
$this->pager['start'] = ($this->pager['page'] * $this->pager['itemspage']) - $this->pager['itemspage'];
- if($this->pager['start'] < 1)
+ if($this->pager['start'] < 0)
$this->pager['start'] = 1;
$this->pager['total'] = 0;
}
diff --git a/mod/message.php b/mod/message.php
index 519634be5..80d2c6d99 100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -224,6 +224,7 @@ function message_content(&$a) {
// list messages
$o .= $header;
+
$r = q("SELECT count(*) AS `total` FROM `mail`
WHERE `mail`.`uid` = %d GROUP BY `parent-uri` ORDER BY `created` DESC",
@@ -232,7 +233,7 @@ function message_content(&$a) {
);
if(count($r))
$a->set_pager_total($r[0]['total']);
-
+
$r = q("SELECT max(`mail`.`created`) AS `mailcreated`, min(`mail`.`seen`) AS `mailseen`,
`mail`.* , `contact`.`name`, `contact`.`url`, `contact`.`thumb` , `contact`.`network`,
count( * ) as count
@@ -243,6 +244,7 @@ function message_content(&$a) {
intval($a->pager['start']),
intval($a->pager['itemspage'])
);
+
if(! count($r)) {
info( t('No messages.') . EOL);
return $o;