Fix single cat detecting for correct $disp_detail

yurabakhtin · yurabakhtin · commit 1ae6dfaa1b74 · 2020-06-25T11:37:11.000+03:00
diff --git a/inc/items/model/_itemlistlight.class.php b/inc/items/model/_itemlistlight.class.php
@@ -415,7 +415,9 @@ function load_from_Request( $use_filters = true )
 		$cat = param( 'cat', '/^[*\-\|]?([0-9]+(,[0-9]+)*)?$/', $this->default_filters['cat_modifier'], true ); // List of cats to restrict to
 		$catsel = param( 'catsel', 'array:integer', $this->default_filters['cat_array'], true );  // Array of cats to restrict to
 
-		if( empty( $catsel ) && preg_match( '~^[0-9]+$~', $cat ) )
+		if( ( empty( $catsel ) || // 'catsel' multicats filter is not defined
+		      ( is_array( $catsel ) && count( $catsel ) == 1 ) // 'catsel' filter is used for single cat, e.g. when skin config 'cat_array_mode' = 'parent'
+		    ) && preg_match( '~^[0-9]+$~', $cat ) ) // 'cat' filter is ID of category and NOT modifier for 'catsel' multicats
 		{	// We are on a single cat page: (equivalent to $disp_detail == 'posts-topcat')
 			// NOTE: we must have selected EXACTLY ONE CATEGORY through the cat parameter
 			// BUT: - this can resolve to including children
diff --git a/inc/skins/_skin.funcs.php b/inc/skins/_skin.funcs.php
@@ -462,7 +462,9 @@ function skin_init( $disp )
 
 					global $cat, $catsel;
 
-					if( empty( $catsel ) && preg_match( '~^[0-9]+$~', $cat ) )
+					if( ( empty( $catsel ) || // 'catsel' filter is not defined
+					      ( is_array( $catsel ) && count( $catsel ) == 1 ) // 'catsel' filter is used for single cat, e.g. when skin config 'cat_array_mode' = 'parent'
+					    ) && preg_match( '~^[0-9]+$~', $cat ) ) // 'cat' filter is ID of category and NOT modifier for 'catsel' multicats
 					{	// We are on a single cat page:
 						// NOTE: we must have selected EXACTLY ONE CATEGORY through the cat parameter
 						// BUT: - this can resolve to including children
diff --git a/skins/bootstrap_forums_skin/_skin.class.php b/skins/bootstrap_forums_skin/_skin.class.php
@@ -704,7 +704,7 @@ function get_template( $name )
 		{
 			case 'cat_array_mode':
 				// What category level use to display the items on disp=posts:
-				//   - 'children' - Get items from current category and from all its sub-categories recirsively
+				//   - 'children' - Get items from current category and from all its sub-categories recursively
 				//   - 'parent' - Get items ONLY from current category WITHOUT sub-categories
 				return 'parent';
 

Original file line number	Diff line number	Diff line change
`@@ -704,7 +704,7 @@ function get_template( $name )`
`704`	`704`	`{`
`705`	`705`	`case 'cat_array_mode':`
`706`	`706`	`// What category level use to display the items on disp=posts:`
`707`		`- // - 'children' - Get items from current category and from all its sub-categories recirsively`
	`707`	`+ // - 'children' - Get items from current category and from all its sub-categories recursively`
`708`	`708`	`// - 'parent' - Get items ONLY from current category WITHOUT sub-categories`
`709`	`709`	`return 'parent';`
`710`	`710`