Merge remote branch 'friendica/master'

diff --combined boot.php
index accaf1d0c549760f679a144a237ba72c65d5895a,3064b817d27028175136f9915e26e5b531ffbfab..0e7c7c44a019623f95b5b8b9d5149f91785e1979
--- 1/boot.php
--- 2/boot.php
+++ b/boot.php
@@@ -12,9 -12,9 +12,9 @@@ require_once('library/Mobile_Detect/Mob
  require_once('include/features.php');
  
  define ( 'FRIENDICA_PLATFORM',     'Friendica');
- define ( 'FRIENDICA_VERSION',      '3.1.1592' );
+ define ( 'FRIENDICA_VERSION',      '3.1.1601' );
  define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
- define ( 'DB_UPDATE_VERSION',      1158      );
+ define ( 'DB_UPDATE_VERSION',      1159      );
  
  define ( 'EOL',                    "<br />\r\n"     );
  define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
@@@ -1364,15 -1364,9 +1364,15 @@@ if(! function_exists('profile_sidebar')
  
  
                        }
 -
 -
                }
 +        if ($profile['uid'] == local_user() && !feature_enabled(local_user(),'multi_profiles')) {
 +            $profile['edit'] = array($a->get_baseurl(). '/profiles/'.$profile['id'], t('Edit profile'),"", t('Edit profile'));
 +              $profile['menu'] = array(
 +                              'chg_photo' => t('Change profile photo'),
 +                              'cr_new' => null,
 +                              'entries' => array(),
 +                      );
 +        }
  
  
  
@@@ -1425,7 -1419,6 +1425,7 @@@
                if($a->theme['template_engine'] === 'internal')
                        $location = template_escape($location);
  
 +
                $tpl = get_markup_template('profile_vcard.tpl');
                $o .= replace_macros($tpl, array(
                        '$profile' => $p,
@@@ -1942,6 -1935,36 +1942,36 @@@ function build_querystring($params, $na
      return $ret;    
  }
  
+ function explode_querystring($query) {
+       $arg_st = strpos($query, '?');
+       if($arg_st !== false) {
+               $base = substr($query, 0, $arg_st);
+               $arg_st += 1;
+       }
+       else {
+               $base = '';
+               $arg_st = 0;
+       }
+ 
+       $args = explode('&', substr($query, $arg_st));
+       foreach($args as $k=>$arg) {
+               if($arg === '')
+                       unset($args[$k]);
+       }
+       $args = array_values($args);
+ 
+       if(!$base) {
+               $base = $args[0];
+               unset($args[0]);
+               $args = array_values($args);
+       }
+ 
+       return array(
+               'base' => $base,
+               'args' => $args,
+       );
+ }
+ 
  /**
  * Returns the complete URL of the current page, e.g.: http(s)://something.com/network
  *