diff options
| author | Mario <mario@mariovavti.com> | 2022-11-07 19:53:03 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2022-11-07 19:53:03 +0000 |
| commit | 23b272aafd7d7d6fe82430ef3382745351cf285c (patch) | |
| tree | f25659844c56c8d1a552352825485efaccfa3529 /Zotlabs | |
| parent | 36b8b6bf6c8b7dc6bfd997e322493b0548103110 (diff) | |
| parent | 057db41758daf85a1506fff8e5332db2dc62b2b9 (diff) | |
| download | volse-hubzilla-23b272aafd7d7d6fe82430ef3382745351cf285c.tar.gz volse-hubzilla-23b272aafd7d7d6fe82430ef3382745351cf285c.tar.bz2 volse-hubzilla-23b272aafd7d7d6fe82430ef3382745351cf285c.zip | |
merge conflict
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Lib/Apps.php | 4 | ||||
| -rw-r--r-- | Zotlabs/Module/Wall_upload.php | 22 |
2 files changed, 13 insertions, 13 deletions
diff --git a/Zotlabs/Lib/Apps.php b/Zotlabs/Lib/Apps.php index a9c7d0a2a..497a9d299 100644 --- a/Zotlabs/Lib/Apps.php +++ b/Zotlabs/Lib/Apps.php @@ -605,8 +605,8 @@ class Apps { '$deleted' => $papp['deleted'] ?? false, '$feature' => ((isset($papp['embed']) || $mode == 'edit') ? false : true), '$pin' => ((isset($papp['embed']) || $mode == 'edit') ? false : true), - '$featured' => ((isset($papp['categories']) && strpos($papp['categories'], 'nav_featured_app') === false) ? false : true), - '$pinned' => ((isset($papp['categories']) && strpos($papp['categories'], 'nav_pinned_app') === false) ? false : true), + '$featured' => ((isset($papp['categories']) && strpos($papp['categories'], 'nav_featured_app') !== false) ? true : false), + '$pinned' => ((isset($papp['categories']) && strpos($papp['categories'], 'nav_pinned_app') !== false) ? true : false), '$mode' => $mode, '$add' => t('Add to app-tray'), '$remove' => t('Remove from app-tray'), diff --git a/Zotlabs/Module/Wall_upload.php b/Zotlabs/Module/Wall_upload.php index 6d58e4032..3e979588c 100644 --- a/Zotlabs/Module/Wall_upload.php +++ b/Zotlabs/Module/Wall_upload.php @@ -11,10 +11,10 @@ require_once('include/photos.php'); class Wall_upload extends \Zotlabs\Web\Controller { function post() { - - - $using_api = ((x($_FILES,'media')) ? true : false); - + + + $using_api = ((x($_FILES,'media')) ? true : false); + if($using_api) { require_once('include/api.php'); if(api_user()) @@ -24,32 +24,32 @@ class Wall_upload extends \Zotlabs\Web\Controller { if(argc() > 1) $channel = channelx_by_nick(argv(1)); } - + if(! $channel) { if($using_api) return; notice( t('Channel not found.') . EOL); killme(); } - + $observer = \App::get_observer(); - + $args = array( 'source' => 'editor', 'visible' => 0, 'contact_allow' => array($channel['channel_hash'])); - + $ret = photo_upload($channel,$observer,$args); - + if(! $ret['success']) { if($using_api) return; notice($ret['message']); killme(); } - + if($using_api) return("\n\n" . $ret['body'] . "\n\n"); else echo "\n\n" . $ret['body'] . "\n\n"; killme(); } - + } |