Fix nested positive ifs

administrator/components/com_finder/models/index.php

@@ -417,16 +417,13 @@ public function publish(&$pks, $value = 1)
 		{
 			$table->reset();
 
-			if ($table->load($pk))
+			if ($table->load($pk) && !$this->canEditState($table))
 			{
-				if (!$this->canEditState($table))
-				{
-					// Prune items that you can't change.
-					unset($pks[$i]);
-					$this->setError(JText::_('JLIB_APPLICATION_ERROR_EDITSTATE_NOT_PERMITTED'));
+				// Prune items that you can't change.
+				unset($pks[$i]);
+				$this->setError(JText::_('JLIB_APPLICATION_ERROR_EDITSTATE_NOT_PERMITTED'));
 
-					return false;
-				}
+				return false;
 			}
 		}
 

administrator/components/com_finder/models/maps.php

@@ -357,16 +357,13 @@ public function publish(&$pks, $value = 1)
 		{
 			$table->reset();
 
-			if ($table->load($pk))
+			if ($table->load($pk) && !$this->canEditState($table))
 			{
-				if (!$this->canEditState($table))
-				{
 					// Prune items that you can't change.
 					unset($pks[$i]);
 					$this->setError(JText::_('JLIB_APPLICATION_ERROR_EDITSTATE_NOT_PERMITTED'));
 
 					return false;
-				}
 			}
 		}
 

administrator/components/com_finder/views/filter/view.html.php

@@ -116,19 +116,16 @@ protected function addToolbar()
 		else
 		{
 			// Can't save the record if it's checked out.
-			if (!$checkedOut)
+			// Since it's an existing record, check the edit permission.
+			if (!$checkedOut && $canDo->get('core.edit'))
 			{
-				// Since it's an existing record, check the edit permission.
-				if ($canDo->get('core.edit'))
+				JToolbarHelper::apply('filter.apply');
+				JToolbarHelper::save('filter.save');
+
+				// We can save this record, but check the create permission to see if we can return to make a new one.
+				if ($canDo->get('core.create'))
 				{
-					JToolbarHelper::apply('filter.apply');
-					JToolbarHelper::save('filter.save');
-
-					// We can save this record, but check the create permission to see if we can return to make a new one.
-					if ($canDo->get('core.create'))
-					{
-						JToolbarHelper::save2new('filter.save2new');
-					}
+					JToolbarHelper::save2new('filter.save2new');
 				}
 			}