← All changes | blocks/Post_Module_1.php +23 -25 2.1.2 → 2.2.5 View file →

		@@ -43,26 +43,25 @@
43	43	'queryTax' => [
44	44	'type' => 'string',
45	45	'default' => 'category'
46	46	],
47		- 'queryCat' => [
	47	+ 'queryTaxValue' => [
48	48	'type' => 'string',
49	49	'default' => '[]',
50	50	'style' => [
51	51	(object)[
52		- 'depends' => [(object)['key' => 'queryTax','condition' => '==','value' => 'category']]
	52	+ 'depends' => [(object)['key' => 'queryTax','condition' => '!=','value' => '']]
53	53	],
54	54	],
55	55	],
56		- 'queryTag' => [
	56	+ 'queryCat' => [ // for compatibility
57	57	'type' => 'string',
58		- 'default' => '[]',
59		- 'style' => [
60		- (object)[
61		- 'depends' => [(object)['key' => 'queryTax','condition' => '==','value' => 'post_tag']]
62		- ],
63		- ],
	58	+ 'default' => '[]'
64	59	],
	60	+ 'queryTag' => [ // for compatibility
	61	+ 'type' => 'string',
	62	+ 'default' => '[]'
	63	+ ],
65	64	'queryOrderBy' => [
66	65	'type' => 'string',
67	66	'default' => 'date',
68	67	],
		@@ -1055,9 +1054,9 @@
1055	1054	'depends' => [
1056	1055	(object)['key'=>'catShow','condition'=>'==','value'=>true],
1057	1056	(object)['key'=>'customCatColor','condition'=>'!=','value'=>true],
1058	1057	],
1059		- 'selector'=>'{{ULTP}} .ultp-category-grid a { color:{{catColor}}; }'
	1058	+ 'selector'=>'{{ULTP}} .ultp-block-item .ultp-category-grid a { color:{{catColor}}; }'
1060	1059	],
1061	1060	],
1062	1061	],
1063	1062	'catBgColor' => [
		@@ -1421,9 +1420,9 @@
1421	1420	'depends' => [(object)['key' => 'showImage','condition' => '==','value' => 'true']]
1422	1421	],
1423	1422	'imgCropSmall' => [
1424	1423	'type' => 'string',
1425		- 'default' => 'ultp_layout_square',
	1424	+ 'default' => (ultimate_post()->get_setting('disable_image_size') == 'yes' ? 'full' : 'ultp_layout_square'),
1426	1425	'depends' => [(object)['key' => 'showImage','condition' => '==','value' => 'true']]
1427	1426	],
1428	1427	'imgWidth' => [
1429	1428	'type' => 'object',
		@@ -1809,26 +1808,25 @@
1809	1808	'filterText' => [
1810	1809	'type' => 'string',
1811	1810	'default' => 'all'
1812	1811	],
1813		- 'filterCat' => [
	1812	+ 'filterValue' => [
1814	1813	'type' => 'string',
1815	1814	'default' => '[]',
1816	1815	'style' => [
1817	1816	(object)[
1818		- 'depends' => [(object)['key' => 'filterType','condition' => '==','value' => 'category']]
	1817	+ 'depends' => [(object)['key' => 'filterType','condition' => '!=','value' => '']]
1819	1818	],
1820	1819	],
1821	1820	],
1822		- 'filterTag' => [
	1821	+ 'filterCat' => [ // for compatibility
1823	1822	'type' => 'string',
1824		- 'default' => '[]',
1825		- 'style' => [
1826		- (object)[
1827		- 'depends' => [(object)['key' => 'filterType','condition' => '==','value' => 'post_tag']]
1828		- ],
1829		- ],
	1823	+ 'default' => '[]'
1830	1824	],
	1825	+ 'filterTag' => [ // for compatibility
	1826	+ 'type' => 'string',
	1827	+ 'default' => '[]'
	1828	+ ],
1831	1829	'fliterTypo' => [
1832	1830	'type' => 'object',
1833	1831	'default' => (object)['openTypography' => 1,'size' => (object)['lg' =>14, 'unit' =>'px'],'height' => (object)['lg' =>18, 'unit' =>'px'], 'decoration' => 'none','family'=>'','weight'=>500],
1834	1832	'style' => [
		@@ -2147,15 +2145,15 @@
2147	2145	],
2148	2146	],
2149	2147	'pagiHoverbg' => [
2150	2148	'type' => 'object',
2151		- 'default' => (object)['openColor' => 1, 'type' => 'color', 'color' => '#1740f5', 'replace'=>1],
	2149	+ 'default' => (object)['openColor' => 1, 'type' => 'color', 'color' => '#1740f5','replace'=>1],
2152	2150	'style' => [
2153	2151	(object)[
2154	2152	'depends' => [
2155	2153	(object)['key'=>'paginationShow','condition'=>'==','value'=>true],
2156	2154	],
2157		- 'selector'=>'{{ULTP}} .ultp-pagination li.pagination-active a, {{ULTP}} .ultp-next-prev-wrap ul li a:hover, {{ULTP}} .ultp-loadmore .ultp-loadmore-action:hover { {{pagiHoverbg}} } @media (min-width: 768px) { {{ULTP}} .ultp-pagination li a:hover { {{pagiHoverbg}} }}'
	2155	+ 'selector'=>'{{ULTP}} .ultp-pagination li a:hover, {{ULTP}} .ultp-pagination li.pagination-active a, {{ULTP}} .ultp-pagination-wrap .ultp-pagination li a:focus, {{ULTP}} .ultp-next-prev-wrap ul li a:hover, {{ULTP}} .ultp-loadmore-action:hover{ {{pagiHoverbg}} }'
2158	2156	],
2159	2157	],
2160	2158	],
2161	2159	'pagiHoverBorder' => [
		@@ -2189,9 +2187,9 @@
2189	2187	(object)[
2190	2188	'depends' => [
2191	2189	(object)['key'=>'paginationShow','condition'=>'==','value'=>true],
2192	2190	],
2193		- 'selector'=>'{{ULTP}} .ultp-pagination li a:hover, {{ULTP}} .ultp-next-prev-wrap ul li a:hover, {{ULTP}} .ultp-loadmore-action:hover { border-radius:{{pagiHoverRadius}}; }'
	2191	+ 'selector'=>'{{ULTP}} .ultp-pagination li.pagination-active a, {{ULTP}} .ultp-pagination li a:hover, {{ULTP}} .ultp-next-prev-wrap ul li a:hover, {{ULTP}} .ultp-loadmore-action:hover { border-radius:{{pagiHoverRadius}}; }'
2194	2192	],
2195	2193	],
2196	2194	],
2197	2195	'pagiPadding' => [
		@@ -2412,10 +2410,10 @@
2412	2410
2413	2411	public function content($attr, $noAjax) {
2414	2412
2415	2413	if(!$noAjax){
2416		- $paged = (get_query_var('paged')) ? get_query_var('paged') : 1;
2417		- $attr['paged'] = $paged;
	2414	+ $paged = is_front_page() ? get_query_var('page') : get_query_var('paged');
	2415	+ $attr['paged'] = $paged ? $paged : 1;
2418	2416	}
2419	2417
2420	2418	$bigloop = '';
2421	2419	$block_name = 'post-module-1';