Merge branch 'master' of git://github.com/friendica/friendica

diff --combined boot.php
index 0fafa1cf304a4d584344aaecc5d1a6e68ebff6c7,ace358faa7253e41543f6f09768caecbbbd3211a..93c667dc9bf364024d8377ca79ca14a9e100586d
--- 1/boot.php
--- 2/boot.php
+++ b/boot.php
@@@ -9,7 -9,7 +9,7 @@@ require_once('include/nav.php')
  require_once('include/cache.php');
  
  define ( 'FRIENDICA_PLATFORM',     'Friendica');
- define ( 'FRIENDICA_VERSION',      '2.3.1278' );
+ define ( 'FRIENDICA_VERSION',      '2.3.1279' );
  define ( 'DFRN_PROTOCOL_VERSION',  '2.22'    );
  define ( 'DB_UPDATE_VERSION',      1131      );
  
@@@ -1209,7 -1209,7 +1209,7 @@@ function current_theme()
        $a = get_app();
        
        $system_theme = ((isset($a->config['system']['theme'])) ? $a->config['system']['theme'] : '');
 -      $theme_name = ((is_array($_SESSION) && x($_SESSION,'theme')) ? $_SESSION['theme'] : $system_theme);
 +      $theme_name = ((isset($_SESSION) && x($_SESSION,'theme')) ? $_SESSION['theme'] : $system_theme);
        
        if($theme_name && file_exists('view/theme/' . $theme_name . '/style.css'))
                return($theme_name);
@@@ -1335,7 -1335,7 +1335,7 @@@ function profile_tabs($a, $is_owner=Fal
                array(
                        'label' => t('Profile'),
                        'url'   => $url.'/?tab=profile',
 -                      'sel'   => (($tab=='profile')?'active':''),
 +                      'sel'   => ((isset($tab) && $tab=='profile')?'active':''),
                ),
                array(
                        'label' => t('Photos'),