X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=boot.php;h=ba9e2b6e44081b274fb5b855531777911c0857fa;hb=581349de59091ee2aa55398dd3b03b1d6f808af7;hp=66d4bc124b40f7201e3b15367d720c62ea923793;hpb=8fbde780b37e3d5eeb2ee672a3474b3701eb9645;p=friendica.git
diff --git a/boot.php b/boot.php
index 66d4bc124b..ba9e2b6e44 100644
--- a/boot.php
+++ b/boot.php
@@ -2,9 +2,9 @@
set_time_limit(0);
-define ( 'FRIENDIKA_VERSION', '2.1.922' );
+define ( 'FRIENDIKA_VERSION', '2.1.931' );
define ( 'DFRN_PROTOCOL_VERSION', '2.1' );
-define ( 'DB_UPDATE_VERSION', 1043 );
+define ( 'DB_UPDATE_VERSION', 1045 );
define ( 'EOL', "
\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 .= '