more work on new contact edit page - plus first port to testbubble

[friendica.git] / boot.php

diff --git a/boot.php b/boot.php
index b60411625a8819c816e47e03e1d20308ed476275..af5c2db0b429cea3f52fafb5a9aae29ba1cc5e60 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -8,10 +8,10 @@ require_once("include/pgettext.php");
 require_once('include/nav.php');
 require_once('include/cache.php');
 
-define ( 'FRIENDIKA_PLATFORM',     'Free Friendika');
-define ( 'FRIENDIKA_VERSION',      '2.3.1145' );
-define ( 'DFRN_PROTOCOL_VERSION',  '2.21'    );
-define ( 'DB_UPDATE_VERSION',      1098      );
+define ( 'FRIENDIKA_PLATFORM',     'Friendica');
+define ( 'FRIENDIKA_VERSION',      '2.3.1159' );
+define ( 'DFRN_PROTOCOL_VERSION',  '2.22'    );
+define ( 'DB_UPDATE_VERSION',      1103      );
 
 define ( 'EOL',                    "<br />\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
@@ -94,7 +94,7 @@ define ( 'PAGE_FREELOVE',          3 );
  */
 
 define ( 'NETWORK_ZOT',              'zot!');    // Zot!
-define ( 'NETWORK_DFRN',             'dfrn');    // Friendika, Mistpark, other DFRN implementations
+define ( 'NETWORK_DFRN',             'dfrn');    // Friendica, Mistpark, other DFRN implementations
 define ( 'NETWORK_OSTATUS',          'stat');    // status.net, identi.ca, GNU-social, other OStatus implementations
 define ( 'NETWORK_FEED',             'feed');    // RSS/Atom feeds with no known "post/notify" protocol
 define ( 'NETWORK_DIASPORA',         'dspr');    // Diaspora
@@ -191,7 +191,7 @@ function startup() {
        set_time_limit(0);
 
        // This has to be quite large to deal with embedded private photos
-       ini_set('pcre.backtrack_limit', 350000);
+       ini_set('pcre.backtrack_limit', 500000);
 
 
        if (get_magic_quotes_gpc()) {
@@ -254,6 +254,8 @@ class App {
        public  $plugins;
        public  $apps = array();
        public  $identities;
+       
+       public $nav_sel;
 
        private $scheme;
        private $hostname;
@@ -652,7 +654,7 @@ function get_guid($size=16) {
 // returns the complete html for inserting into the page
 
 if(! function_exists('login')) {
-function login($register = false) {
+function login($register = false, $hiddens=false) {
        $o = "";
        $reg = false;
        if ($register) {
@@ -683,6 +685,7 @@ function login($register = false) {
                '$openid'               => !$noid,
                '$lopenid'      => array('openid_url', t('OpenID: '),'',''),
                
+               '$hiddens'      => $hiddens,
                
                '$register'             => $reg,
                
@@ -823,6 +826,13 @@ function profile_load(&$a, $nickname, $profile = 0) {
        if(! (x($a->page,'aside')))
                $a->page['aside'] = '';
 
+       if(local_user() && local_user() == $a->profile['uid']) {
+               $a->page['aside'] .= replace_macros(get_markup_template('profile_edlink.tpl'),array(
+                       '$editprofile' => t('Edit profile'),
+                       '$profid' => $a->profile['id']
+               ));
+       }
+
        $block = (((get_config('system','block_public')) && (! local_user()) && (! remote_user())) ? true : false);
 
        $a->page['aside'] .= profile_sidebar($a->profile, $block);