Merge branch 'pull'

diff --combined boot.php
index 8f0e8345fc40c4328e9d5a5804e65ef4ee7413c4,93c667dc9bf364024d8377ca79ca14a9e100586d..749ef6e3f3ae30ee5dc7d3f7497cd9cfaf44f12e
--- 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.1279' );
 +define ( 'FRIENDICA_VERSION',      '2.3.1280' );
  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'),

diff --combined mod/dfrn_request.php
index 1043d6daf61e4faf9600e302b663b37247403390,452fec1669fe1880d1a1df44e39511c9ba3a4573..4acb5c9bb51905d01f8d970cded159551c0f1c12
--- 1/mod/dfrn_request.php
--- 2/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@@ -43,7 -43,7 +43,7 @@@ function dfrn_request_post(&$a) 
                return;
  
  
-       if($_POST['cancel']) {
+       if(x($_POST, 'cancel')) {
                goaway(z_root());
        } 
  
@@@ -666,11 -666,7 +666,11 @@@ function dfrn_request_content(&$a) 
                $page_desc = sprintf( t('Diaspora members: Please do not use this form. Instead, enter "%s" into your Diaspora search bar.'), 
                        $target_addr) . EOL . EOL;
  
 -              $page_desc .= t("Please enter your 'Identity Address' from one of the following supported social networks:");
 +              $page_desc .= t("Please enter your 'Identity Address' from one of the following supported communications networks:");
 +
 +              $emailnet = t("<strike>Connect as an email follower</strike> \x28Coming soon\x29");
 +
 +              $invite_desc = t('If you are not yet a member of the free social web, <a href="http://dir.friendica.com/siteinfo">follow this link to find a public Friendica site and join us today</a>.');
  
                $o .= replace_macros($tpl,array(
                        '$header' => t('Friend/Connection Request'),
@@@ -686,8 -682,6 +686,8 @@@
                        '$diaspora' => t('Diaspora'),
                        '$diasnote' => t('- please share from your own site as noted above'),
                        '$your_address' => t('Your Identity Address:'),
 +                      '$invite_desc' => $invite_desc,
 +                      '$emailnet' => $emailnet,
                        '$submit' => t('Submit Request'),
                        '$cancel' => t('Cancel'),
                        '$nickname' => $a->argv[1],