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

change album_id logic to make it work with ajax calls

Browse Source
This commit is contained in:
Mario Vavti 2015-12-07 13:27:35 +01:00
parent 69c9f4588c
commit 0df4f9c114
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/widgets.php
View File

@ -1299,7 +1299,6 @@ function widget_album($args) {
//edit album name //edit album name
$album_edit = null; $album_edit = null;
$photos = array(); $photos = array();
if($r) { if($r) {
$twist = 'rotright'; $twist = 'rotright';

6
mod/photos.php
View File

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