Merge remote-tracking branch 'origin/master'

[friendica.git] / boot.php

diff --git a/boot.php b/boot.php
index e28d00946645b26b5e7a170fad4bed06b96743c3..f12ec0d8d8d4091b6efa202e422ec057a613b3dc 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -2,9 +2,9 @@
 
 set_time_limit(0);
 
-define ( 'FRIENDIKA_VERSION',      '2.1.924' );
+define ( 'FRIENDIKA_VERSION',      '2.1.932' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.1'  );
-define ( 'DB_UPDATE_VERSION',      1043   );
+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) {
@@ -1862,11 +1863,11 @@ function format_like($cnt,$arr,$type,$id) {
 
 if(! function_exists('load_view_file')) {
 function load_view_file($s) {
+       global $lang;
+       if(! isset($lang))
+               $lang = 'en';
        $b = basename($s);
        $d = dirname($s);
-       $lang = get_config('system','language');
-       if($lang === false)
-               $lang = 'en';
        if(file_exists("$d/$lang/$b"))
                return file_get_contents("$d/$lang/$b");
        return file_get_contents($s);
@@ -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
+}}