aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-07-18 19:16:47 -0700
committerzotlabs <mike@macgirvin.com>2017-07-18 19:16:47 -0700
commitb52a968c7461c9873d20d40887f470ab255f16f2 (patch)
treeecaac0ae6c74e32c07d80db466df3ec813a1d281 /include
parent82aa87c190e65b16bbf3656cdae7260ff11c780f (diff)
parent229f95d55584008740ce50859ca54fd94c6db11f (diff)
downloadvolse-hubzilla-b52a968c7461c9873d20d40887f470ab255f16f2.tar.gz
volse-hubzilla-b52a968c7461c9873d20d40887f470ab255f16f2.tar.bz2
volse-hubzilla-b52a968c7461c9873d20d40887f470ab255f16f2.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'include')
-rw-r--r--include/photos.php3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/photos.php b/include/photos.php
index 46b833531..f5d5fdb48 100644
--- a/include/photos.php
+++ b/include/photos.php
@@ -595,8 +595,7 @@ function photos_album_exists($channel_id, $observer_hash, $album) {
// partial backward compatibility with Hubzilla < 2.4 when we used the filename only
// (ambiguous which would get chosen if you had two albums of the same name in different directories)
-
- if(! $r) {
+ if(!$r) {
$r = q("SELECT folder, hash, is_dir, filename, os_path, display_path FROM attach WHERE filename = '%s' AND is_dir = 1 AND uid = %d $sql_extra limit 1",
dbesc(hex2bin($album)),
intval($channel_id)