aboutsummaryrefslogtreecommitdiffstats
path: root/include/api.php
diff options
context:
space:
mode:
authorMichael Meer <michael@meer.name>2014-01-23 08:50:27 +0100
committerMichael Meer <michael@meer.name>2014-01-23 08:50:27 +0100
commitaec78b32840e09b4a212ca075f97f9fa8d03d90e (patch)
treebe3dbad9a5eba8e92643548600e5c58deb33f033 /include/api.php
parent6a1e73e610350bf3e19354e182803329f1234a8e (diff)
parentbc98f4ddf4cdfa655385c705d97fa006ada9c49f (diff)
downloadvolse-hubzilla-aec78b32840e09b4a212ca075f97f9fa8d03d90e.tar.gz
volse-hubzilla-aec78b32840e09b4a212ca075f97f9fa8d03d90e.tar.bz2
volse-hubzilla-aec78b32840e09b4a212ca075f97f9fa8d03d90e.zip
Merge branch 'master' of https://github.com/friendica/red
to be in sync with main repro
Diffstat (limited to 'include/api.php')
-rw-r--r--include/api.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/api.php b/include/api.php
index 463d29cf8..e854012e5 100644
--- a/include/api.php
+++ b/include/api.php
@@ -556,7 +556,7 @@ require_once('include/photos.php');
function api_photos(&$a,$type) {
$album = $_REQUEST['album'];
- json_return_and_die(photos_list_photos($a->get_channel(),$a->get_observer()),$album);
+ json_return_and_die(photos_list_photos($a->get_channel(),$a->get_observer(),$album));
}
api_register_func('api/red/photos','api_photos', true);