fix: issue #588

daylightstudio · Nov 18, 2021 · 2396417 · 2396417
1 parent 3f47caa
commit 2396417
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/fuel/modules/fuel/controllers/Module.php b/fuel/modules/fuel/controllers/Module.php
@@ -1626,7 +1626,10 @@ function delete($id = NULL)
 
 			if (!$this->_is_valid_csrf())
 			{
-				add_error(lang('data_not_deleted'));
+				//add_error(lang('data_not_deleted'));
+				$this->fuel->admin->set_notification(lang('data_not_deleted'), Fuel_admin::NOTIFICATION_ERROR);
+				$url = fuel_uri($this->module_uri);
+				redirect($url);
 			}
 
 			if (!empty($id))

diff --git a/fuel/modules/fuel/libraries/Fuel_base_controller.php b/fuel/modules/fuel/libraries/Fuel_base_controller.php
@@ -165,6 +165,8 @@ protected function _prep_csrf()
 
 		$this->form_builder->key_check_name = $this->_get_csrf_token_name();
 		$this->form_builder->key_check = $hash;
+
+		$this->load->vars(array('_csrf' => $this->form_builder->key_check, '_csrf_name' => $this->form_builder->key_check_name));
 	}
 
 	// --------------------------------------------------------------------

diff --git a/fuel/modules/fuel/views/modules/module_delete.php b/fuel/modules/fuel/views/modules/module_delete.php
@@ -7,6 +7,7 @@
 
 	<p class="instructions"><?=lang('delete_item_message')?><br/> <span class="delete"><?=$title?></span></p>
 	<?=$this->form->hidden('id', $id)?>
+	<?=$this->form->hidden($_csrf_name, $_csrf)?>
 
 	<div class="buttonbar clearfix">
 		<ul>