aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2015-03-11 00:21:57 -0700
committerfriendica <info@friendica.com>2015-03-11 00:21:57 -0700
commit0014cf4ff232328c3e3d0993eb8e9893a7c16f54 (patch)
tree2975f3a1cb3fae945c4413deb930f2f5b2a75d9b
parent844b2ae5873ea2e53bf284abe39ad7a19fe27256 (diff)
downloadvolse-hubzilla-0014cf4ff232328c3e3d0993eb8e9893a7c16f54.tar.gz
volse-hubzilla-0014cf4ff232328c3e3d0993eb8e9893a7c16f54.tar.bz2
volse-hubzilla-0014cf4ff232328c3e3d0993eb8e9893a7c16f54.zip
skip trying to come up with an intelligent way to decide what photos should get a status post - leave it manual.
-rw-r--r--include/photos.php20
-rw-r--r--version.inc2
2 files changed, 2 insertions, 20 deletions
diff --git a/include/photos.php b/include/photos.php
index 4841e649d..c2f5ed4ba 100644
--- a/include/photos.php
+++ b/include/photos.php
@@ -34,29 +34,11 @@ function photo_upload($channel, $observer, $args) {
$album = datetime_convert('UTC',date_default_timezone_get(),'now', 'Y-m');
}
- /**
- *
- * We create a wall item for every photo, but we don't want to
- * overwhelm the data stream with a hundred newly uploaded photos.
- * So we will make the first photo uploaded to this album in the last several hours
- * visible by default, the rest will become visible over time when and if
- * they acquire comments, likes, dislikes, and/or tags
- *
- */
-
- $r = q("SELECT * FROM photo WHERE album = '%s' AND uid = %d AND created > %s - INTERVAL %s ",
- dbesc($album),
- intval($channel_id),
- db_utcnow(), db_quoteinterval('3 HOUR')
- );
- if((! $r) || ($album == t('Profile Photos')))
+ if(intval($args['visible']) || $args['visible'] === 'true')
$visible = 1;
else
$visible = 0;
- if(intval($args['visible']) || $args['visible'] === 'true')
- $visible = 1;
-
$str_group_allow = perms2str(((is_array($args['group_allow'])) ? $args['group_allow'] : explode(',',$args['group_allow'])));
$str_contact_allow = perms2str(((is_array($args['contact_allow'])) ? $args['contact_allow'] : explode(',',$args['contact_allow'])));
$str_group_deny = perms2str(((is_array($args['group_deny'])) ? $args['group_deny'] : explode(',',$args['group_deny'])));
diff --git a/version.inc b/version.inc
index 04354188a..4012103ea 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-03-10.967
+2015-03-11.968