merge conflict

5 files changed, 26 insertions, 20 deletions

diff --git a/CHANGELOG b/CHANGELOG
index b8d4785ba..e486ef83a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+Hubzilla 7.8.3 (2022-11-07)
+	- Fix regression where auto created directories were not created with public permissions
+	- Fix regression where pinned/featured state of apps was not displayed correctly
+
+
 Hubzilla 7.8.2 (2022-11-05)
 	- Pubcrawl: fix regression in inbox
 	- Fix display issue of shares coming from streams
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();
 	}
-	
+
 }
diff --git a/boot.php b/boot.php
index bc4b6a597..112d41cb4 100644
--- a/boot.php
+++ b/boot.php
@@ -60,7 +60,9 @@ require_once('include/bbcode.php');
 require_once('include/items.php');
 
 define('PLATFORM_NAME', 'hubzilla');
-define('STD_VERSION', '7.8.2');
+
+define('STD_VERSION', '7.8.3');
+
 define('ZOT_REVISION', '6.0');
 
 define('DB_UPDATE_VERSION', 1253);
diff --git a/include/attach.php b/include/attach.php
index 3b63bd651..fd418103d 100644
--- a/include/attach.php
+++ b/include/attach.php
@@ -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;