aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-03-21 21:13:14 -0700
committerMario Vavti <mario@mariovavti.com>2017-03-29 14:11:22 +0200
commit032b6f193df3e9de1e0af1a742f047b4b3e29023 (patch)
tree1ecf94ef4f4eea7fe29bdb36a0692851e4193740
parente49c59959b328d28b05b484bd7dbe49198fc5710 (diff)
downloadvolse-hubzilla-032b6f193df3e9de1e0af1a742f047b4b3e29023.tar.gz
volse-hubzilla-032b6f193df3e9de1e0af1a742f047b4b3e29023.tar.bz2
volse-hubzilla-032b6f193df3e9de1e0af1a742f047b4b3e29023.zip
photos_album_exists() requires an observer to work correctly; provide it.
-rw-r--r--Zotlabs/Module/Photos.php4
-rw-r--r--include/photos.php5
2 files changed, 4 insertions, 5 deletions
diff --git a/Zotlabs/Module/Photos.php b/Zotlabs/Module/Photos.php
index a9e7c883e..f7786c3fa 100644
--- a/Zotlabs/Module/Photos.php
+++ b/Zotlabs/Module/Photos.php
@@ -95,7 +95,7 @@ class Photos extends \Zotlabs\Web\Controller {
$album = argv(3);
- if(! photos_album_exists($page_owner_uid,$album)) {
+ if(! photos_album_exists($page_owner_uid, get_observer_hash(), $album)) {
notice( t('Album not found.') . EOL);
goaway(z_root() . '/' . $_SESSION['photo_return']);
}
@@ -681,7 +681,7 @@ class Photos extends \Zotlabs\Web\Controller {
\App::$page['htmlhead'] .= "\r\n" . '<link rel="alternate" type="application/json+oembed" href="' . z_root() . '/oep?f=&url=' . urlencode(z_root() . '/' . \App::$cmd) . '" title="oembed" />' . "\r\n";
- if($x = photos_album_exists($owner_uid,$datum)) {
+ if($x = photos_album_exists($owner_uid, get_observer_hash(), $datum)) {
\App::set_pager_itemspage(60);
$album = $x['display_path'];
}
diff --git a/include/photos.php b/include/photos.php
index de947fd4b..49c2d66f5 100644
--- a/include/photos.php
+++ b/include/photos.php
@@ -582,9 +582,8 @@ function photos_list_photos($channel, $observer, $album = '') {
* @param string $album name of the album
* @return boolean
*/
-function photos_album_exists($channel_id, $album) {
-
- $sql_extra = permissions_sql($channel_id);
+function photos_album_exists($channel_id, $observer_hash, $album) {
+ $sql_extra = permissions_sql($channel_id,$observer_hash);
$r = q("SELECT folder, hash, is_dir, filename, os_path, display_path FROM attach WHERE hash = '%s' AND is_dir = 1 AND uid = %d $sql_extra limit 1",
dbesc($album),