diff options
| author | zotlabs <mike@macgirvin.com> | 2017-09-27 20:43:47 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-09-27 20:43:47 -0700 |
| commit | 0f36916fb40ae963652aa150e7b3aa22a9572d15 (patch) | |
| tree | 146701f0742f27bbdd2e22830f13ed859f781779 /Zotlabs/Module | |
| parent | b9664f6980452390b120e0c7443fd773d527b3bd (diff) | |
| parent | 1fd2b6f5b673b78af594f778db5f30954897adce (diff) | |
| download | volse-hubzilla-0f36916fb40ae963652aa150e7b3aa22a9572d15.tar.gz volse-hubzilla-0f36916fb40ae963652aa150e7b3aa22a9572d15.tar.bz2 volse-hubzilla-0f36916fb40ae963652aa150e7b3aa22a9572d15.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'Zotlabs/Module')
| -rw-r--r-- | Zotlabs/Module/Photos.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Module/Post.php | 15 |
2 files changed, 5 insertions, 12 deletions
diff --git a/Zotlabs/Module/Photos.php b/Zotlabs/Module/Photos.php index f86801fcc..2ca9bfe50 100644 --- a/Zotlabs/Module/Photos.php +++ b/Zotlabs/Module/Photos.php @@ -770,7 +770,7 @@ class Photos extends \Zotlabs\Web\Controller { if($photos) { $o = replace_macros(get_markup_template('photosajax.tpl'),array( '$photos' => $photos, - '$album_id' => bin2hex($album) + '$album_id' => $datum )); } else { diff --git a/Zotlabs/Module/Post.php b/Zotlabs/Module/Post.php index dba26075f..f67cbf020 100644 --- a/Zotlabs/Module/Post.php +++ b/Zotlabs/Module/Post.php @@ -24,18 +24,11 @@ class Post extends \Zotlabs\Web\Controller { } function post() { + if(array_key_exists('data',$_REQUEST)) { + $z = new \Zotlabs\Zot\Receiver($_REQUEST['data'], get_config('system', 'prvkey'), new \Zotlabs\Zot\ZotHandler()); + exit; + } - - - - - - - - $z = new \Zotlabs\Zot\Receiver($_REQUEST['data'], get_config('system', 'prvkey'), new \Zotlabs\Zot\ZotHandler()); - - // notreached; - exit; } } |