diff options
| author | Olivier Migeot <olivier@migeot.org> | 2011-03-28 12:11:10 +0200 |
|---|---|---|
| committer | Olivier Migeot <olivier@migeot.org> | 2011-03-28 12:11:10 +0200 |
| commit | da546588db1863dd240a4c738644372fc4d183e6 (patch) | |
| tree | dd6c869207098867aa6c7207f29ab5a2e9b6dc69 /boot.php | |
| parent | 19d7e7fefeb3d20697d6a7e0b1fc7a16d9127c64 (diff) | |
| parent | 1f6c6c466a449ba422c4e67744577f6c35b3ce0b (diff) | |
| download | volse-hubzilla-da546588db1863dd240a4c738644372fc4d183e6.tar.gz volse-hubzilla-da546588db1863dd240a4c738644372fc4d183e6.tar.bz2 volse-hubzilla-da546588db1863dd240a4c738644372fc4d183e6.zip | |
Merge remote branch 'mike/master'
Diffstat (limited to 'boot.php')
| -rw-r--r-- | boot.php | 11 |
1 files changed, 6 insertions, 5 deletions
@@ -2,9 +2,9 @@ set_time_limit(0); -define ( 'FRIENDIKA_VERSION', '2.1.925' ); +define ( 'FRIENDIKA_VERSION', '2.1.931' ); define ( 'DFRN_PROTOCOL_VERSION', '2.1' ); -define ( 'DB_UPDATE_VERSION', 1044 ); +define ( 'DB_UPDATE_VERSION', 1045 ); define ( 'EOL', "<br />\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); @@ -1068,6 +1068,7 @@ function paginate(&$a) { $stripped = preg_replace('/(&page=[0-9]*)/','',$a->query_string); $stripped = str_replace('q=','',$stripped); $stripped = trim($stripped,'/'); + $pagenum = $a->pager['page']; $url = $a->get_baseurl() . '/' . $stripped; @@ -1080,7 +1081,7 @@ function paginate(&$a) { $numpages = $a->pager['total'] / $a->pager['itemspage']; - $numstart = 1; + $numstart = 1; $numstop = $numpages; if($numpages > 14) { @@ -2019,7 +2020,7 @@ function contact_block() { intval($shown) ); if(count($r)) { - $o .= '<h4 class="contact-h4">' . $total . ' ' . t('Contacts') . '</h4><div id="contact-block">'; + $o .= '<h4 class="contact-h4">' . sprintf(tt('%d Contact','%d Contacts', $total),$total) . '</h4><div id="contact-block">'; foreach($r as $rr) { $redirect_url = $a->get_baseurl() . '/redir/' . $rr['id']; if(local_user() && ($rr['uid'] == local_user()) @@ -2665,4 +2666,4 @@ function extract_item_authors($arr,$uid) { } } return array(); -}}
\ No newline at end of file +}} |