Merge branch 'release/1.4.13'

daylightstudio · Sep 30, 2020 · 40da634 · 40da634
2 parents 63d9999 + 60ac9c8
commit 40da634
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 6 deletions.
diff --git a/fuel/application/config/MY_fuel.php b/fuel/application/config/MY_fuel.php
@@ -76,7 +76,7 @@
 	'strip_tags', 'date', 
 	'detect_lang','lang',
 	'js', 'css', 'swf', 'img_path', 'css_path', 'js_path', 'swf_path', 'pdf_path', 'media_path', 'cache_path', 'captcha_path', 'assets_path', // assets specific
-	'fuel_block', 'fuel_model', 'fuel_nav', 'fuel_edit', 'fuel_set_var', 'fuel_var', 'fuel_var_append', 'fuel_form', 'fuel_page', // FUEL specific
+	'fuel_block', 'fuel_nav', 'fuel_edit', 'fuel_set_var', 'fuel_var', 'fuel_var_append', 'fuel_form', 'fuel_page', // FUEL specific
 	'quote', 'safe_mailto', // HTML/URL specific
 	'session_flashdata', 'session_userdata', // Session specific
 	'prep_url', 'site_url', 'show_404', 'redirect', 'uri_segment', 'auto_typography', 'current_url' // CI specific

diff --git a/fuel/modules/fuel/config/fuel.php b/fuel/modules/fuel/config/fuel.php
@@ -330,6 +330,8 @@
 // Will auto arrange the navigation into the normal order
 $config['nav_auto_arrange'] = TRUE;
 
+// Determines wether to display the action buttons when using inline modal window
+$config['allow_inline_actions'] = FALSE;
 
 /*
 |--------------------------------------------------------------------------

diff --git a/fuel/modules/fuel/config/fuel_constants.php b/fuel/modules/fuel/config/fuel_constants.php
@@ -1,6 +1,6 @@
 <?php 
 // INSTALL_ROOT is defined in the index.php bootstrap file
-define('FUEL_VERSION', '1.4.12');
+define('FUEL_VERSION', '1.4.13');
 if (!defined('MODULES_FOLDER'))
 {
 	define('MODULES_FOLDER', '../../fuel/modules');

diff --git a/fuel/modules/fuel/controllers/Login.php b/fuel/modules/fuel/controllers/Login.php
@@ -214,6 +214,10 @@ public function pwd_reset()
 						}
 						else
 						{
+							// Reset the key back to empty if not successful send
+							$user['reset_key'] = '';
+							$this->fuel_users_model->save($user);
+							$user['reset_key'] = $token;
 							$this->session->set_flashdata('error', lang('error_pwd_reset'));
 							$this->fuel->logs->write($this->fuel->notification->last_error(), 'debug');
 						}

diff --git a/fuel/modules/fuel/libraries/Fuel_admin.php b/fuel/modules/fuel/libraries/Fuel_admin.php
@@ -306,8 +306,8 @@ public function check_login()
 				$output = "<script type=\"text/javascript\" charset=\"utf-8\">\n";
 				$output .= "top.window.location = '".site_url($login)."'\n";
 				$output .= "</script>\n";
-				$this->CI->output->set_output($output);
-				return;
+				echo $output;
+				exit();
 			}
 		}
 	}
@@ -960,7 +960,7 @@ public function set_inline($inline)
 		{
 			$this->set_panel_display('top', FALSE);
 			$this->set_panel_display('nav', FALSE);
-			$this->set_panel_display('actions', FALSE);
+			$this->set_panel_display('actions', (isset($this->CI->allow_inline_actions) ? $this->CI->allow_inline_actions : $this->CI->fuel->config('allow_inline_actions')));
 		}
 		else
 		{

diff --git a/fuel/modules/fuel/libraries/Fuel_modules.php b/fuel/modules/fuel/libraries/Fuel_modules.php
@@ -664,6 +664,7 @@ public function info($prop = NULL)
 				'instructions' => lang('module_instructions_default', strtolower(humanize($this->module))),
 				'filters' => array(),
 				'archivable' => TRUE,
+				'allow_inline_actions' => $this->fuel->config('allow_inline_actions'),
 				'table_headers' => array(),
 				'table_actions' => array('EDIT', 'VIEW', 'DELETE'),
 				'item_actions' => array('save', 'view', 'publish', 'activate', 'delete', 'duplicate', 'replace', 'create'),
@@ -707,7 +708,7 @@ public function info($prop = NULL)
 					$info[$key] = $val;
 				}
 			}
-			
+
 			// icon class for module
 			if (empty($info['icon_class']))
 			{

diff --git a/fuel/modules/fuel/views/_docs/modules/simple.php b/fuel/modules/fuel/views/_docs/modules/simple.php
@@ -148,6 +148,12 @@
 			<td>Boolean Value TRUE/FALSE</td>
 			<td>Saves to the archive table for later retrieval if you need to revert back</td>
 		</tr>
+		<tr>
+			<td><strong>allow_inline_actions</strong></td>
+			<td>TRUE</td>
+			<td>Boolean Value TRUE/FALSE</td>
+			<td>Determines wether to display the action buttons when using inline modal window for creating/editing a module's data.</td>
+		</tr>
 		<tr>
 			<td><strong>table_actions</strong></td>
 			<td>EDIT, VIEW, DELETE</td>