required filter on elements was not stopping query from being run

mircesco · Aug 29, 2011 · 51206ac · 51206ac
1 parent 68f309d
commit 51206ac
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/administrator/components/com_fabrik/com_fabrik.manifest.class.php b/administrator/components/com_fabrik/com_fabrik.manifest.class.php
@@ -188,6 +188,9 @@ function preflight($type, $parent)
 
 	function postflight($type, $parent)
 	{
+		$db = JFactory::getDbo();
+		$db->setQuery("UPDATE #__extensions SET enabled = 1 WHERE type = 'plugin' AND (folder LIKE 'fabrik_%' OR (folder='system' AND element = 'fabrik'))");
+		$db->query();
 		$this->fixmMenuComponentId();
 		if ($type !== 'update') {
 			if (!$this->setConnection()) {
@@ -214,9 +217,7 @@ function postflight($type, $parent)
 here to install sample data</a></p>
 	  ';
 
-			$db = JFactory::getDbo();
-			$db->setQuery("UPDATE #__extensions SET enabled = 1 WHERE type = 'plugin' AND (folder LIKE 'fabrik_%' OR (folder='system' AND element = 'fabrik'))");
-			$db->query();
+
 			// An example of setting a redirect to a new location after the install is completed
 			//$parent->getParent()->set('redirect_url', 'http://www.google.com');
 

diff --git a/administrator/components/com_fabrik/language/en-GB/en-GB.com_fabrik.ini b/administrator/components/com_fabrik/language/en-GB/en-GB.com_fabrik.ini
@@ -100,7 +100,8 @@ COM_FABRIK_DATABASE_UPDATED="Database updated"
 COM_FABRIK_DB_TABLE_ALREADY_EXISTS="A database table of that name already exists"
 COM_FABRIK_DB_TABLE_NAME="Db table"
 COM_FABRIK_DEBUGGING="Debugging"
-COM_FABRIK_DEFAULT="Default"
+COM_FABRIK_DEFAULT="Default"
+COM_FABRIK_DEFAULT_TO_GLOBAL="Use global"
 COM_FABRIK_DELETE="Delete"
 COM_FABRIK_DELETE_FROM="For these lists:"
 COM_FABRIK_DELETE_JOINED_ROWS_DESC="When deleting a record from the table, should joined records also be deleted?"

diff --git a/components/com_fabrik/models/list.php b/components/com_fabrik/models/list.php
@@ -1596,6 +1596,9 @@ protected function filtersRequired()
 	{
 		$app =& JFactory::getApplication();
 		$params =& $this->getParams();
+		if (!$this->getRequiredFiltersFound()) {
+			return true;
+		}
 		switch ($params->get('require-filter', 0)) {
 			case 0:
 			default: