aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2015-03-04 18:55:17 -0800
committerfriendica <info@friendica.com>2015-03-04 18:55:17 -0800
commit76eb0a7e5606d61153b199094482c4c55685a035 (patch)
treea0d73443575237dcaa1358bf32d57e98d046c842
parentad3b4da3ff5751a5e0da6ba7e46a4fc8731d4d28 (diff)
downloadvolse-hubzilla-76eb0a7e5606d61153b199094482c4c55685a035.tar.gz
volse-hubzilla-76eb0a7e5606d61153b199094482c4c55685a035.tar.bz2
volse-hubzilla-76eb0a7e5606d61153b199094482c4c55685a035.zip
Deprecate the "wall uploads" photo album. Photo uploads (from any source) with no album specified will go now into an album based on YYYY-MM.
-rw-r--r--include/photos.php2
-rw-r--r--mod/wall_upload.php3
2 files changed, 2 insertions, 3 deletions
diff --git a/include/photos.php b/include/photos.php
index 794ff7748..cd753ffea 100644
--- a/include/photos.php
+++ b/include/photos.php
@@ -31,7 +31,7 @@ function photo_upload($channel, $observer, $args) {
if($newalbum)
$album = $newalbum;
else
- $album = datetime_convert('UTC',date_default_timezone_get(),'now', 'Y');
+ $album = datetime_convert('UTC',date_default_timezone_get(),'now', 'Y-m');
}
/**
diff --git a/mod/wall_upload.php b/mod/wall_upload.php
index 7ed1859a8..81ca643df 100644
--- a/mod/wall_upload.php
+++ b/mod/wall_upload.php
@@ -32,8 +32,7 @@ function wall_upload_post(&$a) {
$observer = $a->get_observer();
- $args = array( 'source' => 'editor', 'album' => t('Wall Photos'),
- 'not_visible' => 1, 'contact_allow' => array($channel['channel_hash']));
+ $args = array( 'source' => 'editor', 'not_visible' => 1, 'contact_allow' => array($channel['channel_hash']));
$ret = photo_upload($channel,$observer,$args);