← All changes | Inc/Core/FB/Boxes.php +44 -43 1.0.5 → 2.1.39 View file →

		@@ -1,12 +1,12 @@
1	1	<?php
2	2	/**
3	3	* @package FireBox
4		- * @version 1.0.5 Free
	4	+ * @version 2.1.39 Free
5	5	*
6	6	* @author FirePlugins <[email protected]>
7	7	* @link https://www.fireplugins.com
8		- * @copyright Copyright © 2021 FirePlugins All Rights Reserved
	8	+ * @copyright Copyright © 2025 FirePlugins All Rights Reserved
9	9	* @license GNU GPLv3 <http://www.gnu.org/licenses/gpl.html> or later
10	10	*/
11	11
12	12	namespace FireBox\Core\FB;
		@@ -21,31 +21,8 @@
21	21
22	22	class Boxes
23	23	{
24	24	/**
25		- * A box instance
26		- *
27		- * @var Box
28		- */
29		- protected $box;
30		-
31		- /**
32		- * Factory
33		- *
34		- * @var Factory
35		- */
36		- protected $factory;
37		-
38		- public function __construct($box = null, $factory = null)
39		- {
40		- if (!$factory)
41		- {
42		- $factory = new \FPFramework\Base\Factory();
43		- }
44		- $this->factory = $factory;
45		- }
46		-
47		- /**
48	25	* Render boxes
49	26	*
50	27	* @return string
51	28	*/
		@@ -50,19 +27,14 @@
50	27	* @return string
51	28	*/
52	29	public function render()
53	30	{
54		- if (!$boxes_query = BoxHelper::getAllBoxesWPQuery())
	31	+ if (!$boxes = BoxHelper::getAllBoxes())
55	32	{
56	33	return;
57	34	}
58	35
59		- if (!method_exists($boxes_query, 'have_posts') || (method_exists($boxes_query, 'have_posts') && !$boxes_query->have_posts()))
60		- {
61		- return;
62		- }
63		-
64		- return $this->renderAll($boxes_query);
	36	+ return $this->renderAll($boxes);
65	37	}
66	38
67	39	/**
68	40	* Renders all boxes
		@@ -73,33 +45,62 @@
73	45	*/
74	46	public function renderAll($boxes)
75	47	{
76	48	$html = '';
77		-
78		- // handle WP_Query boxes loop
79		- if (isset($boxes->posts))
	49	+
	50	+ if ($boxes instanceof \WP_Query)
80	51	{
81		- foreach ($boxes->posts as $box)
	52	+ if (!$boxes->have_posts())
82	53	{
	54	+ return;
	55	+ }
	56	+
	57	+ // Backup global state
	58	+ global $post, $authordata;
	59	+ $originalPost = $post;
	60	+ $originalAuthorData = $authordata;
	61	+
	62	+ // Setup the post data for our custom query
	63	+ while ($boxes->have_posts())
	64	+ {
83	65	$boxes->the_post();
84	66
85		- $this->prepare($box);
	67	+ global $post;
86	68
87		- $html .= $this->get_output($box);
	69	+ $this->prepare($post);
	70	+
	71	+ // If the mode is embed, abort.
	72	+ if ($post->params->get('mode') == 'embed')
	73	+ {
	74	+ continue;
	75	+ }
	76	+
	77	+ $html .= $this->get_output($post);
88	78	}
89		- wp_reset_query();
	79	+
	80	+ // Reset post data
	81	+ wp_reset_postdata();
	82	+
	83	+ // Restore global state
	84	+ $post = $originalPost;
	85	+ $authordata = $originalAuthorData;
90	86	}
91		- else
92		- // handle boxes array
	87	+ else if (is_array($boxes))
93	88	{
94	89	foreach ($boxes as $box)
95	90	{
96	91	$this->prepare($box);
	92	+
	93	+ // If the mode is embed, abort.
	94	+ if ($box->params->get('mode') == 'embed')
	95	+ {
	96	+ continue;
	97	+ }
97	98
98	99	$html .= $this->get_output($box);
99	100	}
100	101	}
101		-
	102	+
102	103	return $html;
103	104	}
104	105
105	106	/**
		@@ -134,7 +135,7 @@
134	135	{
135	136	return '';
136	137	}
137	138
138		- return firebox()->box->render($box);
	139	+ return firebox()->box->setBox($box)->render();
139	140	}
140	141	}