TheRON/core
1
0
Fork 0
mirror of https://framagit.org/hubzilla/core.git synced 2026-06-21 00:52:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix regression where automatically created directories were not public and pinned/featured state of apps was not displayed correctly

Browse Source
This commit is contained in:
Mario
2022-11-07 19:41:22 +00:00
parent 40d74fa779
commit 839c5a8e41
3 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Zotlabs/Lib/Apps.php
View File

@@ -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'),

22
Zotlabs/Module/Wall_upload.php
View File

@@ -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();
}
}

11
include/attach.php
View File

@@ -707,13 +707,12 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
$darr = array('pathname' => $pathname);
// if we need to create a directory, use the channel default permissions.
$darr['allow_cid'] = $channel['channel_allow_cid'];
$darr['allow_gid'] = $channel['channel_allow_gid'];
$darr['deny_cid'] = $channel['channel_deny_cid'];
$darr['deny_gid'] = $channel['channel_deny_gid'];
// if we need to create a directory at this point, make it public
$darr['allow_cid'] = '';
$darr['allow_gid'] = '';
$darr['deny_cid'] = '';
$darr['deny_gid'] = '';
$direct = null;