harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge https://github.com/redmatrix/hubzilla into pending_merge

Browse Source
This commit is contained in:
redmatrix
2015-12-07 16:15:52 -08:00
parent bd7d851758 96d94551f9
commit 241607e7d7
13 changed files with 889 additions and 1058 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mod/photos.php
View File

@@ -765,6 +765,7 @@ function photos_content(&$a) {
if($photos) {
$o = replace_macros(get_markup_template('photosajax.tpl'),array(
'$photos' => $photos,
'$album_id' => bin2hex($album)
));
}
else {
@@ -779,6 +780,7 @@ function photos_content(&$a) {
$o .= replace_macros($tpl, array(
'$photos' => $photos,
'$album' => $album,
'$album_id' => bin2hex($album),
'$album_edit' => array(t('Edit Album'), $album_edit),
'$can_post' => $can_post,
'$upload' => array(t('Upload'), $a->get_baseurl() . '/photos/' . $a->data['channel']['channel_address'] . '/upload/' . bin2hex($album)),
@@ -1300,6 +1302,7 @@ function photos_content(&$a) {
if($photos) {
$o = replace_macros(get_markup_template('photosajax.tpl'),array(
'$photos' => $photos,
'$album_id' => bin2hex(t('Recent Photos'))
));
}
else {
@@ -1313,6 +1316,7 @@ function photos_content(&$a) {
$tpl = get_markup_template('photos_recent.tpl');
$o .= replace_macros($tpl, array(
'$title' => t('Recent Photos'),
'$album_id' => bin2hex(t('Recent Photos')),
'$can_post' => $can_post,
'$upload' => array(t('Upload'), $a->get_baseurl().'/photos/'.$a->data['channel']['channel_address'].'/upload'),
'$photos' => $photos,