← All changes | tables/blocks.php +3 -5 11.3 → 6.0.9 View file →

		@@ -54,9 +54,9 @@
54	54	* @param mixed $filters
55	55	* @deprecated @param mixed $returnType
56	56	* @param mixed $orderBy
57	57	*/
58		- public function get($ids = array(), $fields = array('*'), $filters = array(), $returnType = OBJECT_K, $orderBy = array(), $useDefaultBackupFltr = true) {
	58	+ public function get($ids = array(), $fields = array('*'), $filters = array(), $returnType = OBJECT_K, $orderBy = array()) {
59	59	// Warn if $returnTypes is used
60	60	if ($returnType != OBJECT_K) {
61	61	die('Warning! Using $returnType with value other than OBJECT_K from the caller!!!');
62	62	}
		@@ -68,12 +68,10 @@
68	68	$ids = implode(',', $ids);
69	69	$where[] = " `id` IN ({$ids})";
70	70	}
71	71	// Filter by backup name.
72		- if ($useDefaultBackupFltr) {
73		- $where[] = (!isset($filters['backupId']) ? ' `backupId` IS NULL' : " `backupId` = {$filters['backupId']}");
74		- unset($filters['backupId']);
75		- }
	72	+ $where[] = (!isset($filters['backupId']) ? ' `backupId` IS NULL' : " `backupId` = {$filters['backupId']}");
	73	+ unset($filters['backupId']);
76	74	// Filter by parent.
77	75	if (isset($filters['parent'])) {
78	76	$filters['parent'] = implode(',', ((array) $filters['parent']));
79	77	$where[] = " `parent` IN ({$filters['parent']})";