Merge pull request jamierumbelow#128 from mayurvirkar/master

jamierumbelow · jamierumbelow · commit 19a97fda4bff · 2013-08-10T19:23:27.000-07:00
removed unsed $valid
diff --git a/core/MY_Model.php b/core/MY_Model.php
@@ -388,9 +388,11 @@ public function delete($id)
     public function delete_by()
     {
         $where = func_get_args();
+
+	    $where = $this->trigger('before_delete', $where);
+
         $this->_set_where($where);
 
-        $where = $this->trigger('before_delete', $where);
 
         if ($this->soft_delete)
         {

Original file line number	Diff line number	Diff line change
`@@ -388,9 +388,11 @@ public function delete($id)`
`388`	`388`	`public function delete_by()`
`389`	`389`	`{`
`390`	`390`	`$where = func_get_args();`
	`391`	`+`
	`392`	`+ $where = $this->trigger('before_delete', $where);`
	`393`	`+`
`391`	`394`	`$this->_set_where($where);`
`392`	`395`
`393`		`- $where = $this->trigger('before_delete', $where);`
`394`	`396`
`395`	`397`	`if ($this->soft_delete)`
`396`	`398`	`{`