X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=boot.php;h=73f2aa882fd90a9c4786b1aeb96f9d287c775e78;hb=e2e6b56c448da3a67fa25df118bbb7cbc3239664;hp=5ba3b1b4a1737d18c1ca3baf0966872d64481148;hpb=a3d95f79f27ca73d657907ab42b51ecc50872089;p=friendica.git diff --git a/boot.php b/boot.php index 5ba3b1b4a1..73f2aa882f 100644 --- a/boot.php +++ b/boot.php @@ -9,7 +9,7 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '2.3.1311' ); +define ( 'FRIENDICA_VERSION', '2.3.1314' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1138 ); @@ -936,6 +936,7 @@ if(! function_exists('profile_load')) { } if(($r === false) || (! count($r))) { + logger('profile error: ' . $a->query_string, LOGGER_DEBUG); notice( t('Requested profile is not available.') . EOL ); $a->error = 404; return; @@ -1494,11 +1495,13 @@ function get_my_url() { return false; } -function zrl($s) { +function zrl($s,$force = false) { if(! strlen($s)) return $s; - if(! strpos($s,'/profile/')) + if((! strpos($s,'/profile/')) && (! $force)) return $s; + if($force && substr($s,-1,1) !== '/') + $s = $s . '/'; $achar = strpos($s,'?') ? '&' : '?'; $mine = get_my_url(); if($mine and ! link_compare($mine,$s))