diff options
| author | friendica <info@friendica.com> | 2014-10-03 16:52:01 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-10-03 16:52:01 -0700 |
| commit | f618e0211795ce89f612b0108544f4e3d39d25fd (patch) | |
| tree | cf6f043df0c9475aa4651b53fdeaa1ac41f1c21a | |
| parent | ec604a41582d9bd8b659d690c895eb6271b09310 (diff) | |
| parent | 62f7bf51ba3fde8d9427f524ef000000e8852da6 (diff) | |
| download | volse-hubzilla-f618e0211795ce89f612b0108544f4e3d39d25fd.tar.gz volse-hubzilla-f618e0211795ce89f612b0108544f4e3d39d25fd.tar.bz2 volse-hubzilla-f618e0211795ce89f612b0108544f4e3d39d25fd.zip | |
Merge https://github.com/friendica/red into pending_merge
| -rw-r--r-- | include/identity.php | 7 | ||||
| -rw-r--r-- | mod/photos.php | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/include/identity.php b/include/identity.php index ebe4c5d50..fc07bd4e4 100644 --- a/include/identity.php +++ b/include/identity.php @@ -254,8 +254,8 @@ function create_identity($arr) { $r = q("insert into channel ( channel_account_id, channel_primary, channel_name, channel_address, channel_guid, channel_guid_sig, - channel_hash, channel_prvkey, channel_pubkey, channel_pageflags, channel_expire_days $perms_keys ) - values ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d $perms_vals ) ", + channel_hash, channel_prvkey, channel_pubkey, channel_pageflags, channel_expire_days, channel_timezone $perms_keys ) + values ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s' $perms_vals ) ", intval($arr['account_id']), intval($primary), @@ -267,7 +267,8 @@ function create_identity($arr) { dbesc($key['prvkey']), dbesc($key['pubkey']), intval($pageflags), - intval($expire) + intval($expire), + dbesc($a->timezone) ); diff --git a/mod/photos.php b/mod/photos.php index f02f0f5f7..dc593f22b 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -654,7 +654,7 @@ function photos_content(&$a) { ); if($cmd === 'edit') { - if(($album !== t('Profile Photos')) && ($album !== 'Contact Photos') && ($album !== t('Contact Photos'))) { + if(($album !== t('Profile Photos')) && ($album !== 'Profile Photos') && ($album !== 'Contact Photos') && ($album !== t('Contact Photos'))) { if($can_post) { if($a->get_template_engine() === 'internal') { $album_e = template_escape($album); @@ -676,7 +676,7 @@ function photos_content(&$a) { } } else { - if(($album !== t('Profile Photos')) && ($album !== 'Contact Photos') && ($album !== t('Contact Photos'))) { + if(($album !== t('Profile Photos')) && ($album !== 'Profile Photos') && ($album !== 'Contact Photos') && ($album !== t('Contact Photos'))) { if($can_post) { $edit = array(t('Edit Album'), $a->get_baseurl() . '/photos/' . $a->data['channel']['channel_address'] . '/album/' . bin2hex($album) . '/edit'); } |