aboutsummaryrefslogtreecommitdiffstats
path: root/mod/fbrowser.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2015-01-29 15:09:35 -0800
committerfriendica <info@friendica.com>2015-01-29 15:09:35 -0800
commit912be23e1627211fb417c4b7bced414cbbe38ef0 (patch)
tree2b8567d800624167b3eadf37c8855deb0ba74b0b /mod/fbrowser.php
parentff68ea608786a698ad46637ef13854ac1b1e6beb (diff)
parent872b165eb2bb5d632a12f2d7e1a28e195c2d5348 (diff)
downloadvolse-hubzilla-912be23e1627211fb417c4b7bced414cbbe38ef0.tar.gz
volse-hubzilla-912be23e1627211fb417c4b7bced414cbbe38ef0.tar.bz2
volse-hubzilla-912be23e1627211fb417c4b7bced414cbbe38ef0.zip
Merge branch 'master' into tres
Conflicts: include/group.php include/text.php mod/acl.php mod/channel.php mod/connections.php mod/display.php mod/group.php mod/item.php mod/locs.php mod/network.php mod/photos.php mod/ping.php mod/starred.php mod/viewsrc.php
Diffstat (limited to 'mod/fbrowser.php')
-rw-r--r--mod/fbrowser.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/mod/fbrowser.php b/mod/fbrowser.php
index 19bd77914..90b554edd 100644
--- a/mod/fbrowser.php
+++ b/mod/fbrowser.php
@@ -12,7 +12,7 @@ require_once('include/photo/photo_driver.php');
*/
function fbrowser_content($a){
- if (!local_user())
+ if (!local_channel())
killme();
if ($a->argc==1)
@@ -29,7 +29,7 @@ function fbrowser_content($a){
if ($a->argc==2){
$albums = q("SELECT distinct(`album`) AS `album` FROM `photo` WHERE `uid` = %d ",
- intval(local_user())
+ intval(local_channel())
);
// anon functions only from 5.3.0... meglio tardi che mai..
function folder1($el){return array(bin2hex($el['album']),$el['album']);}
@@ -48,7 +48,7 @@ function fbrowser_content($a){
$r = q("SELECT `resource_id`, `id`, `filename`, type, min(`scale`) AS `hiq`,max(`scale`) AS `loq`, `description`
FROM `photo` WHERE `uid` = %d $sql_extra
GROUP BY `resource_id` $sql_extra2",
- intval(local_user())
+ intval(local_channel())
);
function files1($rr){
@@ -87,7 +87,7 @@ function fbrowser_content($a){
case "file":
if ($a->argc==2){
$files = q("SELECT id, filename, filetype FROM `attach` WHERE `uid` = %d ",
- intval(local_user())
+ intval(local_channel())
);
function files2($rr){ global $a;