Merge branch 'themetests' of https://github.com/fabrixxm/friendika into fabrixxm...

diff --combined mod/photos.php
index 27cb1beb1f12a009020541057036bb43046224f3,ebfe714a78dc0ebd0b3e496e6a28a0e955bb265d..d4835ba5ea65edb515a35087c08483f8ac3419e9
--- 1/mod/photos.php
--- 2/mod/photos.php
+++ b/mod/photos.php
@@@ -831,7 -831,7 +831,7 @@@ function photos_content(&$a) 
                        $a->set_pager_itemspage(20);
                }
  
-               $r = q("SELECT `resource-id`, `id`, `filename`, max(`scale`) AS `scale` FROM `photo` WHERE `uid` = %d AND `album` = '%s' 
+               $r = q("SELECT `resource-id`, `id`, `filename`, max(`scale`) AS `scale`, `desc` FROM `photo` WHERE `uid` = %d AND `album` = '%s' 
                        $sql_extra GROUP BY `resource-id` ORDER BY `created` DESC LIMIT %d , %d",
                        intval($owner_uid),
                        dbesc($album),
@@@ -873,7 -873,8 +873,8 @@@
                                        '$photolink' => $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $rr['resource-id'],
                                        '$phototitle' => t('View Photo'),
                                        '$imgsrc' => $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $rr['scale'] . '.jpg',
-                                       '$imgalt' => $rr['filename']
+                                       '$imgalt' => $rr['filename'],
+                                       '$desc'=> $rr['desc']
                                ));
  
                }
@@@ -1048,8 -1049,7 +1049,8 @@@
                                if($can_post || can_write_wall($a,$owner_uid)) {
                                        if($link_item['last-child']) {
                                                $o .= replace_macros($cmnt_tpl,array(
 -                                                      '$return_path' => '', // $return_url,
 +                                                      '$return_path' => '', 
 +                                                      '$jsreload' => $return_url,
                                                        '$type' => 'wall-comment',
                                                        '$id' => $link_item['id'],
                                                        '$parent' => $link_item['id'],
@@@ -1088,8 -1088,7 +1089,8 @@@
                                if($can_post || can_write_wall($a,$owner_uid)) {
                                        if($link_item['last-child']) {
                                                $o .= replace_macros($cmnt_tpl,array(
 -                                                      '$return_path' => $return_url,
 +                                                      '$return_path' => '',
 +                                                      '$jsreload' => $return_url,
                                                        '$type' => 'wall-comment',
                                                        '$id' => $link_item['id'],
                                                        '$parent' => $link_item['id'],
@@@ -1117,8 -1116,7 +1118,8 @@@
  
                                                if($item['last-child']) {
                                                        $comment = replace_macros($cmnt_tpl,array(
 -                                                              '$return_path' => $return_url,
 +                                                              '$return_path' => '',
 +                                                              '$jsreload' => $return_url,
                                                                '$type' => 'wall-comment',
                                                                '$id' => $item['item_id'],
                                                                '$parent' => $item['parent'],