Merge remote branch 'upstream/master'

diff --combined boot.php
index e39504e11c1645cc94ba1c8b3ae56cf53def04e6,c3e5c0de02214d27e4948c5927f747948a16e291..18b6f8375f5e8bd8358c02ef9866b5b354fbdce1
--- 1/boot.php
--- 2/boot.php
+++ b/boot.php
@@@ -9,9 -9,9 +9,9 @@@ require_once('include/nav.php')
  require_once('include/cache.php');
  
  define ( 'FRIENDICA_PLATFORM',     'Friendica');
- define ( 'FRIENDICA_VERSION',      '2.3.1263' );
+ define ( 'FRIENDICA_VERSION',      '2.3.1265' );
  define ( 'DFRN_PROTOCOL_VERSION',  '2.22'    );
- define ( 'DB_UPDATE_VERSION',      1126      );
+ define ( 'DB_UPDATE_VERSION',      1129      );
  
  define ( 'EOL',                    "<br />\r\n"     );
  define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
@@@ -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 include/conversation.php
index 6f0dc3687eb92f23f57c1491fd470645f86f3681,2ef37694dc2dd1a668f4c7bef941538f8e140a87..9f564843e91c77d2827fccf883011443f2c20616
--- 1/include/conversation.php
--- 2/include/conversation.php
+++ b/include/conversation.php
@@@ -6,6 -6,11 +6,11 @@@
  function localize_item(&$item){
  
        $Text = $item['body'];
+ 
+ 
+       // find private image (w/data url) if present and convert image 
+       // link to a magic-auth redirect.
+ 
        $saved_image = '';
        $img_start = strpos($Text,'[img]data:');
        $img_end = strpos($Text,'[/img]');
@@@ -403,6 -408,7 +408,7 @@@ function conversation(&$a, $items, $mod
                                $toplevelprivate = false;
  
                                // Take care of author collapsing and comment collapsing
+                               // (author collapsing is currently disabled)
                                // If a single author has more than 3 consecutive top-level posts, squash the remaining ones.
                                // If there are more than two comments, squash all but the last 2.
                        
@@@ -410,7 -416,9 +416,9 @@@
                                        $toplevelprivate = (($toplevelpost && $item['private']) ? true : false);
                                        $item_writeable = (($item['writable'] || $item['self']) ? true : false);
  
-                                       /*if($blowhard == $item['cid'] && (! $item['self']) && ($mode != 'profile') && ($mode != 'notes')) {
+                                       // DISABLED
+                                       /*
+                                       if($blowhard == $item['cid'] && (! $item['self']) && ($mode != 'profile') && ($mode != 'notes')) {
                                                $blowhard_count ++;
                                                if($blowhard_count == 3) {
                                                        $o .= '<div class="icollapse-wrapper fakelink" id="icollapse-wrapper-' . $item['parent'] 
@@@ -424,7 -432,9 +432,9 @@@
                                                if($blowhard_count >= 3)
                                                        $o .= '</div>';
                                                $blowhard_count = 0;
-                                       }*/
+                                       }
+                                       // END DISABLED
+                                       */
  
                                        $comments_seen = 0;
                                        $comments_collapsed = false;
@@@ -976,8 -986,8 +986,8 @@@ function conv_sort($arr,$order) 
                usort($parents,'sort_thr_commented');
  
        if(count($parents))
 -              foreach($parents as $x) 
 -                      $x['children'] = array();
 +              foreach($parents as $i=>$_x) 
 +                      $parents[$i]['children'] = array();
  
        foreach($arr as $x) {
                if($x['id'] != $x['parent']) {