Hadn't merged fixed typo from upstream.

[friendica.git] / boot.php

diff --git a/boot.php b/boot.php
index fc6d6da8989944677de0c7d10f3d52d60d6f9585..73f2aa882fd90a9c4786b1aeb96f9d287c775e78 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -9,9 +9,9 @@ require_once('include/nav.php');
 require_once('include/cache.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '2.3.1306' );
+define ( 'FRIENDICA_VERSION',      '2.3.1314' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
-define ( 'DB_UPDATE_VERSION',      1137      );
+define ( 'DB_UPDATE_VERSION',      1138      );
 
 define ( 'EOL',                    "<br />\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
@@ -206,6 +206,7 @@ define ( 'ACTIVITY_OBJ_P_PHOTO', NAMESPACE_ACTIVITY_SCHEMA . 'profile-photo' );
 define ( 'ACTIVITY_OBJ_ALBUM',   NAMESPACE_ACTIVITY_SCHEMA . 'photo-album' );
 define ( 'ACTIVITY_OBJ_EVENT',   NAMESPACE_ACTIVITY_SCHEMA . 'event' );
 define ( 'ACTIVITY_OBJ_TAGTERM', NAMESPACE_DFRN            . '/tagterm' );
+define ( 'ACTIVITY_OBJ_PROFILE', NAMESPACE_DFRN            . '/profile' );
 
 /**
  * item weight for query ordering
@@ -657,32 +658,32 @@ if(! function_exists('check_config')) {
 
                                                        // call the specific update
 
-                                                       global $db;
-                                                       $db->excep(TRUE);
-                                                       try {
-                                                               $db->beginTransaction();
+//                                                     global $db;
+//                                                     $db->excep(TRUE);
+//                                                     try {
+//                                                             $db->beginTransaction();
                                                                $func = 'update_' . $x;
                                                                $func($a);
-                                                               $db->commit();
-                                                       } catch(Exception $ex) {
-                                                               $db->rollback();
-                                                               //send the administrator an e-mail
-                                                               $email_tpl = get_intltext_template("update_fail_eml.tpl");
-                                                               $email_tpl = replace_macros($email_tpl, array(
-                                                                       '$sitename' => $a->config['sitename'],
-                                                                       '$siteurl' =>  $a->get_baseurl(),
-                                                                       '$update' => $x,
-                                                                       '$error' => $ex->getMessage()));
-                                                               $subject=sprintf(t('Update Error at %s'), $a->get_baseurl());
+//                                                             $db->commit();
+//                                                     } catch(Exception $ex) {
+//                                                             $db->rollback();
+//                                                             //send the administrator an e-mail
+//                                                             $email_tpl = get_intltext_template("update_fail_eml.tpl");
+//                                                             $email_tpl = replace_macros($email_tpl, array(
+//                                                                     '$sitename' => $a->config['sitename'],
+//                                                                     '$siteurl' =>  $a->get_baseurl(),
+//                                                                     '$update' => $x,
+//                                                                     '$error' => $ex->getMessage()));
+//                                                             $subject=sprintf(t('Update Error at %s'), $a->get_baseurl());
                                                                        
-                                                               mail($a->config['admin_email'], $subject, $text,
-                                                                               'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
-                                                                               . 'Content-type: text/plain; charset=UTF-8' . "\n"
-                                                                               . 'Content-transfer-encoding: 8bit' );
-                                                               //try the logger
-                                                               logger('update failed: '.$ex->getMessage().EOL);
-                                                       }
-                                                       $db->excep(FALSE);
+//                                                             mail($a->config['admin_email'], $subject, $text,
+//                                                                             'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
+//                                                                             . 'Content-type: text/plain; charset=UTF-8' . "\n"
+//                                                                             . 'Content-transfer-encoding: 8bit' );
+//                                                             //try the logger
+//                                                             logger('update failed: '.$ex->getMessage().EOL);
+//                                                     }
+//                                                     $db->excep(FALSE);
                                                }
                                        }
                                        set_config('system','build', DB_UPDATE_VERSION);
@@ -935,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;
@@ -1493,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))