← All changes | models/coupling.php +9 -32 trunk → 8.0 View file →

		@@ -112,9 +112,9 @@
112	112	*/
113	113	public function getOrder() {
114	114	return $this->ongetorder(get_option('meta-box-order_cjtoolbox'));
115	115	}
116		-
	116	+
117	117	/**
118	118	* put your comment there...
119	119	*
120	120	* @param mixed $linksExpressionFlag
		@@ -119,49 +119,26 @@
119	119	*
120	120	* @param mixed $linksExpressionFlag
121	121	* @param mixed $pinPoint
122	122	* @param mixed $customPins
123		- * @param mixed $hookParams
124	123	*/
125		- public function getPinsBlocks( $linksExpressionFlag, $pinPoint, $customPins, $hookParams )
126		- {
	124	+ public function getPinsBlocks($linksExpressionFlag, $pinPoint, $customPins) {
127	125	// Extendable!
128		- extract( $this->onpinsblockfilters( compact( 'linksExpressionFlag', 'pinPoint', 'customPins' ) ) );
129		-
	126	+ extract($this->onpinsblockfilters(compact('linksExpressionFlag', 'pinPoint', 'customPins')));
130	127	// Import required libraries for CJTPinsBlockSQLView.
131	128	require_once CJTOOLBOX_TABLES_PATH . '/pins-blocks-view.php';
132		-
133	129	// Initialize new CJTPinsBlockSQLView view object.
134		- $dbDriver = new CJTMYSQLQueueDriver( $GLOBALS[ 'wpdb' ] );
135		- $view = new CJTPinsBlockSQLView( $dbDriver );
136		-
	130	+ $dbDriver = new CJTMYSQLQueueDriver($GLOBALS['wpdb']);
	131	+ $view = new CJTPinsBlockSQLView($dbDriver);
137	132	// Apply filter to view.
138		- $view->filters( $pinPoint, $customPins );
139		-
140		- # Allow Plugins/Extensions to change block core query
141		- do_action(
142		-
143		- CJTPluggableHelper::ACTION_BLOCK_QUERY_BLOCKS,
144		-
145		- $view,
146		-
147		- $hookParams
148		-
149		- );
150		-
	133	+ $view->filters($pinPoint, $customPins);
151	134	// retreiving blocks data associated with current request.
152		- $blocks = $this->onrequestblocks( $view->exec() );
153		-
154		- # Filter queue blocks
155		- $blocks = apply_filters( CJTPluggableHelper::FILTER_BLOCKS_COUPLING_MODEL_BLOCKS_QUEUE, $blocks, $hookParams );
156		-
	135	+ $blocks = $this->onrequestblocks($view->exec());
157	136	// Get links & expressions Blocks.
158	137	// NOTE: We need only blocks not presented in $blocks var -- exclude their id.
159		- $view->filters( $linksExpressionFlag, array(), 'active', array_keys( $blocks ) );
160		-
	138	+ $view->filters($linksExpressionFlag, array(), 'active', array_keys($blocks));
161	139	// We'll process all blocks inside single loop.
162		- $blocks = $blocks + $this->onexpressionsandlinkedblocks( $view->exec() );
163		-
	140	+ $blocks = $blocks + $this->onexpressionsandlinkedblocks($view->exec());
164	141	return $blocks;
165	142	}
166	143
167	144	/**