whitespace

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

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

Zotlabs/Lib/ThreadItem.php

@@ -358,8 +358,8 @@ class ThreadItem {
 		if($conv->get_mode() === 'channel')
 			$viewthread = z_root() . '/channel/' . $owner_address . '?f=&mid=' . urlencode(gen_link_id($item['mid']));
 
-		$comment_count_txt = sprintf( tt('%d comment','%d comments',$total_children),$total_children );
-		$list_unseen_txt = (($unseen_comments) ? sprintf( t('%d unseen'),$unseen_comments) : '');
+		$comment_count_txt = sprintf(tt('%d Comment', '%d Comments', $total_children), $total_children);
+		$list_unseen_txt = (($unseen_comments) ? sprintf(t('%d unseen'), $unseen_comments) : '');
 
 		$children = $this->get_children();
 

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

boot.php

@@ -60,7 +60,7 @@ 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);

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;
 

view/de-de/hstrings.php

@@ -3432,11 +3432,11 @@ App::$strings["Reply on this comment"] = "Antworte auf diesen Kommentar";
 App::$strings["reply"] = "antworten";
 App::$strings["Reply to"] = "Antwort an";
 App::$strings["Delivery Report"] = "Zustellungsbericht";
-App::$strings["%d comment"] = array(
+App::$strings["%d Comment"] = array(
 	0 => "%d Kommentar",
 	1 => "%d Kommentare",
 );
-App::$strings["%d unseen"] = "1%d ungelesen";
+App::$strings["%d unseen"] = "%d ungelesen";
 App::$strings["Forum"] = "Forum";
 App::$strings["to"] = "an";
 App::$strings["Wall-to-Wall"] = "Wall-to-Wall";