From f009e9c9009dbade3341fa739ccb2e2b22820d50 Mon Sep 17 00:00:00 2001
From: David McReynolds <dave@thedaylightstudio.com>
Date: Mon, 12 Mar 2018 10:56:22 -0700
Subject: [PATCH 001/129] Fix for permissions issue with activate

---
 fuel/modules/fuel/controllers/Module.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fuel/modules/fuel/controllers/Module.php b/fuel/modules/fuel/controllers/Module.php
index 7d4953566..30e96da24 100644
--- a/fuel/modules/fuel/controllers/Module.php
+++ b/fuel/modules/fuel/controllers/Module.php
@@ -921,7 +921,7 @@ protected function _process_create()
 			$posted = $this->_process();
 
 			// set publish status to no if you do not have the ability to publish
-			if ( ! $this->fuel->auth->has_permission($this->permission, 'publish'))
+			if ( ! $this->fuel->auth->has_permission($this->permission, 'publish') AND ! $this->fuel->auth->has_permission($this->permission, 'activate'))
 			{
 				$posted['published'] = 'no';
 				$posted['active'] = 'no';

From f248043e93884d937f492b66409c74fcdc268e0b Mon Sep 17 00:00:00 2001
From: Martynas Sateika <martynas.sateika@gmail.com>
Date: Fri, 16 Mar 2018 00:27:43 +0000
Subject: [PATCH 002/129] Fix typo in word 'compatibility'. Fix unused $module
 variables in Loader

---
 fuel/modules/fuel/core/Loader.php | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/fuel/modules/fuel/core/Loader.php b/fuel/modules/fuel/core/Loader.php
index 3e4b071a2..65b9a68c8 100644
--- a/fuel/modules/fuel/core/Loader.php
+++ b/fuel/modules/fuel/core/Loader.php
@@ -16,7 +16,7 @@
 /**
  * Some additions to the Awesome Modular Extension Library mostly for Matchbox compatibility
  *
- * This Library overides the original MX Loader library
+ * This Library overrides the original MX Loader library
  *
  * @package		FUEL CMS
  * @subpackage	Third Party
@@ -121,7 +121,7 @@ public function _add_module_paths($module = '')
 	public function config($file, $use_sections = FALSE, $fail_gracefully = FALSE, $module = NULL) 
 	{
 		if (!isset($module)) $module = $this->_module; // FUEL
-		return CI::$APP->config->load($file, $use_sections, $fail_gracefully, $this->_module);
+		return CI::$APP->config->load($file, $use_sections, $fail_gracefully, $module);
 	}
 
 	
@@ -133,7 +133,7 @@ public function helper($helper = array(), $module = NULL)
 		
 		if (isset($this->_ci_helpers[$helper]))	return;
 
-		list($path, $_helper) = Modules::find($helper.'_helper', $this->_module, 'helpers/');
+		list($path, $_helper) = Modules::find($helper.'_helper', $module, 'helpers/');
 
 		if ($path === FALSE) return parent::helper($helper);
 
@@ -177,12 +177,12 @@ public function library($library, $params = NULL, $object_name = NULL, $module =
 			
 		($_alias = strtolower($object_name)) OR $_alias = $class;
 		
-		list($path, $_library) = Modules::find($library, $this->_module, 'libraries/');
+		list($path, $_library) = Modules::find($library, $module, 'libraries/');
 		
 		/* load library config file as params */
 		if ($params == NULL) 
 		{
-			list($path2, $file) = Modules::find($_alias, $this->_module, 'config/');	
+			list($path2, $file) = Modules::find($_alias, $module, 'config/');
 			($path2) && $params = Modules::load_file($file, $path2, 'config');
 			
 			// FUEL check application directory
@@ -229,7 +229,7 @@ public function model($model, $object_name = NULL, $connect = FALSE, $module = N
 			return $this;
 			
 		/* check module */
-		list($path, $_model) = Modules::find(strtolower($model), $this->_module, 'models/');
+		list($path, $_model) = Modules::find(strtolower($model), $module, 'models/');
 		
 		if ($path == FALSE)
 		{
@@ -420,42 +420,42 @@ protected function &_ci_get_component($component)
 	METHODS FOR MATCHBOX COMPATIBILITY
 	****************************************************************************/
 	
-	/** Load config Matchbox style for backwards compatability **/
+	/** Load config Matchbox style for backwards compatibility **/
 	public function module_config($module, $file = '', $use_sections = FALSE, $fail_gracefully = FALSE)
 	{
 		if (!isset($module)) $module = $this->_module; // FUEL
 		return $this->config($file, $use_sections, $fail_gracefully, $module);
 	}
 
-	/** Load helper Matchbox style for backwards compatability **/
+	/** Load helper Matchbox style for backwards compatibility **/
 	public function module_helper($module, $helper)
 	{
 		if (!isset($module)) $module = $this->_module; // FUEL
 		return $this->helper($helper, $module);
 	}
 
-	/** Load Language Matchbox style for backwards compatability **/
+	/** Load Language Matchbox style for backwards compatibility **/
 	public function module_language($module, $langfile, $idiom = '', $return = FALSE, $add_suffix = TRUE, $alt_path = '')
 	{
 		if (!isset($module)) $module = $this->_module; // FUEL
 		return $this->language($langfile, $idiom, $return, $add_suffix, $alt_path, $module);
 	}
 
-	/** Load Library Matchbox style for backwards compatability **/
+	/** Load Library Matchbox style for backwards compatibility **/
 	public function module_library($module, $library, $params = NULL, $object_name = NULL)
 	{
 		if (!isset($module)) $module = $this->_module; // FUEL
-		return $this->library($library, $params, $object_name);
+		return $this->library($library, $params, $object_name, $module);
 	}
 	
-	/** Load Model Matchbox style for backwards compatability **/
+	/** Load Model Matchbox style for backwards compatibility **/
 	public function module_model($module, $model, $object_name = NULL, $connect = FALSE)
 	{
 		if (!isset($module)) $module = $this->_module; // FUEL
-		return $this->model($model, $object_name, $connect);
+		return $this->model($model, $object_name, $connect, $module);
 	}
 
-	/** Load view Matchbox style for backwards compatability **/
+	/** Load view Matchbox style for backwards compatibility **/
 	public function module_view($module, $view, $vars = array(), $return = FALSE, $scope = NULL)
 	{
 		if (!isset($module)) $module = $this->_module; // FUEL

From 97523fd976b44f12460b4344b6fb96ac96fa3291 Mon Sep 17 00:00:00 2001
From: Martynas Sateika <martynas.sateika@gmail.com>
Date: Fri, 16 Mar 2018 00:39:56 +0000
Subject: [PATCH 003/129] Fix incorrect usage of 'parse_str' in Google helper

---
 fuel/modules/fuel/helpers/google_helper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fuel/modules/fuel/helpers/google_helper.php b/fuel/modules/fuel/helpers/google_helper.php
index 76bb56420..642bb0fc2 100644
--- a/fuel/modules/fuel/helpers/google_helper.php
+++ b/fuel/modules/fuel/helpers/google_helper.php
@@ -236,7 +236,7 @@ function google_map_url($address, $params = array())
 		// if a query string is passed, then we parse it into an array form
 		if (is_string($params))
 		{
-			$params = parse_str($params);
+			parse_str($params, $params);
 		}
 
 		// initialize the parameter array

From 6408a9589b96312b1f95bbb58fa66c028365f15d Mon Sep 17 00:00:00 2001
From: Martynas Sateika <martynas.sateika@gmail.com>
Date: Fri, 16 Mar 2018 02:08:51 +0000
Subject: [PATCH 004/129] Fix 'Undefined variable' error in Google helper

---
 fuel/modules/fuel/helpers/google_helper.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/fuel/modules/fuel/helpers/google_helper.php b/fuel/modules/fuel/helpers/google_helper.php
index 642bb0fc2..d0202ed34 100644
--- a/fuel/modules/fuel/helpers/google_helper.php
+++ b/fuel/modules/fuel/helpers/google_helper.php
@@ -254,9 +254,8 @@ function google_map_url($address, $params = array())
 				}
 				if (!empty($address['state']))
 				{
-					$addr .= ','.$address['state'];	
+					$p['q'] .= ','.$address['state'];
 				}
-				$p['q'] = $addr;
 			}
 			else
 			{

From f18b52e3f0faafb3ed40c60eb0b5cbf9ddb77cbc Mon Sep 17 00:00:00 2001
From: Martynas Sateika <martynas.sateika@gmail.com>
Date: Fri, 16 Mar 2018 02:10:11 +0000
Subject: [PATCH 005/129] Remove duplicate 'http_build_query' statement

---
 fuel/modules/fuel/helpers/google_helper.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/fuel/modules/fuel/helpers/google_helper.php b/fuel/modules/fuel/helpers/google_helper.php
index d0202ed34..ca75495d5 100644
--- a/fuel/modules/fuel/helpers/google_helper.php
+++ b/fuel/modules/fuel/helpers/google_helper.php
@@ -327,7 +327,6 @@ function google_map_url($address, $params = array())
 		// set output
 		$p['output'] = 'embed';
 		$url = 'http://maps.google.com/maps?'.http_build_query($p, '', '&amp;');
-		$query_str = http_build_query($p, '', '&amp;');
 		return $url;
 	}
 }

From 513458eeaf8044abfbc3ee18b4f5dc9727d8391d Mon Sep 17 00:00:00 2001
From: Martynas Sateika <martynas.sateika@gmail.com>
Date: Sat, 17 Mar 2018 00:43:42 +0000
Subject: [PATCH 006/129] Variable assigned to itself. Incorrect use of string
 concatenation.

---
 fuel/modules/fuel/libraries/Asset.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/fuel/modules/fuel/libraries/Asset.php b/fuel/modules/fuel/libraries/Asset.php
index 088367e4e..5e0408370 100644
--- a/fuel/modules/fuel/libraries/Asset.php
+++ b/fuel/modules/fuel/libraries/Asset.php
@@ -746,7 +746,7 @@ public function js($path, $module = '', $options = array())
 		if ($options['output'] === 'inline')
 		{
 			$open = "<script>\n";
-			$close .= "\t</script>";
+			$close = "\t</script>";
 		}
 		else
 		{
@@ -756,7 +756,6 @@ public function js($path, $module = '', $options = array())
 
 		$str = $this->_output('js', $module, $open, $close, $path, $options);
 		if (!empty($options['echo'])) echo $str;
-		$str = $str;
 		return $str;
 	}
 

From 89409cf666662bc1aa7d6b04369b050c040b1d7e Mon Sep 17 00:00:00 2001
From: David McReynolds <dave@thedaylightstudio.com>
Date: Fri, 16 Mar 2018 22:25:36 -0700
Subject: [PATCH 007/129] Fix for undefined variable in Fuel_pages_model

---
 fuel/modules/fuel/models/Fuel_pages_model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fuel/modules/fuel/models/Fuel_pages_model.php b/fuel/modules/fuel/models/Fuel_pages_model.php
index 4d776f833..f459fe705 100644
--- a/fuel/modules/fuel/models/Fuel_pages_model.php
+++ b/fuel/modules/fuel/models/Fuel_pages_model.php
@@ -230,7 +230,7 @@ public function find_by_location($location, $just_published = 'yes')
 		$data = $this->find_one_array($where, 'location desc');
 
 		// case sensitive check
-		if (empty($data) OR ($data['location'] != $location AND $data['location'] != $wildcard_location.'/:any'))
+		if (empty($data) OR ($data['location'] != $location AND (!empty($wildcard_location) AND $data['location'] != $wildcard_location.'/:any'))
 		{
 			return array();
 		}

From 21606e601681ba9c7970b4812cce25d449a26754 Mon Sep 17 00:00:00 2001
From: Martynas Sateika <martynas.sateika@gmail.com>
Date: Sun, 18 Mar 2018 00:52:01 +0000
Subject: [PATCH 008/129] Fix several duplicate key issues

---
 fuel/modules/fuel/config/fuel_modules.php               | 3 ---
 fuel/modules/fuel/core/MY_Model.php                     | 3 +--
 fuel/modules/fuel/libraries/Form_builder.php            | 1 -
 fuel/modules/fuel/libraries/parser/Fuel_twig_parser.php | 1 -
 fuel/modules/fuel/models/Fuel_navigation_model.php      | 1 -
 fuel/modules/fuel/models/Fuel_pagevariables_model.php   | 2 +-
 6 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/fuel/modules/fuel/config/fuel_modules.php b/fuel/modules/fuel/config/fuel_modules.php
index 15b9dde41..eef64a2ed 100644
--- a/fuel/modules/fuel/config/fuel_modules.php
+++ b/fuel/modules/fuel/config/fuel_modules.php
@@ -43,7 +43,6 @@
 	'advanced_search' => TRUE,
 	'filters' => array(
 		'layout' => array(
-			'default' => 1,
 			'label' => lang('form_label_layout'),
 			'type' => 'select',
 			'model' => 'fuel_pages_model',
@@ -53,7 +52,6 @@
 			'first_option' => 'Select a layout...',
 		),
 		'published' => array(
-			'default' => 1,
 			'label' => lang('form_label_published'),
 			'type' => 'select',
 			'options' => array('yes' => 'Published', 'no' =>'Unpublished'),
@@ -217,7 +215,6 @@
 	'instructions' => lang('assets_instructions'),
 	'filters' => array(
 		'group_id' => array(
-			'default' => 0,
 			'label' => lang('form_label_asset_folder'),
 			'type' => 'select',
 			'options' => array(
diff --git a/fuel/modules/fuel/core/MY_Model.php b/fuel/modules/fuel/core/MY_Model.php
index c046784fb..0fa76b46d 100755
--- a/fuel/modules/fuel/core/MY_Model.php
+++ b/fuel/modules/fuel/core/MY_Model.php
@@ -372,7 +372,7 @@ public function set_tables($tables)
 	 *
 	 * @access	public
 	 * @param	string	the table name (optional)
-	 * @return	string
+	 * @return	string|array|null
 	 */	
 	public function tables($table = NULL)
 	{
@@ -391,7 +391,6 @@ public function tables($table = NULL)
 		{
 			return $this->_tables;
 		}
-		return NULL;
 	}
 
 	// --------------------------------------------------------------------
diff --git a/fuel/modules/fuel/libraries/Form_builder.php b/fuel/modules/fuel/libraries/Form_builder.php
index 635ac4b67..f73e0eb2d 100644
--- a/fuel/modules/fuel/libraries/Form_builder.php
+++ b/fuel/modules/fuel/libraries/Form_builder.php
@@ -1791,7 +1791,6 @@ public function create_text($params)
 			'maxlength' => $params['max_length'], 
 			'size' => $size, 
 			'readonly' => $params['readonly'], 
-			'disabled' => $params['disabled'],
 			'autocomplete' => (!empty($params['autocomplete']) ? $params['autocomplete'] : NULL),
 			'placeholder' => (!empty($params['placeholder']) ? $params['placeholder'] : NULL),
 			'required' => (!empty($params['required']) ? TRUE : NULL),
diff --git a/fuel/modules/fuel/libraries/parser/Fuel_twig_parser.php b/fuel/modules/fuel/libraries/parser/Fuel_twig_parser.php
index ec2640dea..f129f18ea 100644
--- a/fuel/modules/fuel/libraries/parser/Fuel_twig_parser.php
+++ b/fuel/modules/fuel/libraries/parser/Fuel_twig_parser.php
@@ -63,7 +63,6 @@ protected function spawn()
 			}
 
 			$twig = new Twig_Environment($loader, array(
-				'autoescape' => FALSE,
 				'cache' => $this->compile_dir,
 				'debug' => $this->debug,
 				'charset' => $this->charset,
diff --git a/fuel/modules/fuel/models/Fuel_navigation_model.php b/fuel/modules/fuel/models/Fuel_navigation_model.php
index c6934c1c6..7416584da 100644
--- a/fuel/modules/fuel/models/Fuel_navigation_model.php
+++ b/fuel/modules/fuel/models/Fuel_navigation_model.php
@@ -294,7 +294,6 @@ public function form_fields($values = array(), $related = array())
 
 		
 		$fields['group_id'] = array(
-			'type' => 'inline_edit', 
 			'module' => 'navigation_group',
 			'options' => $group_options,
 			'type' => 'select',
diff --git a/fuel/modules/fuel/models/Fuel_pagevariables_model.php b/fuel/modules/fuel/models/Fuel_pagevariables_model.php
index 9ac213f0f..0d069002e 100644
--- a/fuel/modules/fuel/models/Fuel_pagevariables_model.php
+++ b/fuel/modules/fuel/models/Fuel_pagevariables_model.php
@@ -198,7 +198,7 @@ public function find_all_by_page_id($page_id, $lang = NULL)
 		}
 		
 		$data = $this->find_all_array($where);
-		return $this->_process_casting($data);;
+		return $this->_process_casting($data);
 	}
 	
 	// --------------------------------------------------------------------

From 71b490f5288e01336ea839fc3a52c037c1fa46e4 Mon Sep 17 00:00:00 2001
From: Martynas Sateika <martynas.sateika@gmail.com>
Date: Sun, 18 Mar 2018 02:28:10 +0000
Subject: [PATCH 009/129] Move fuel module's helper function PHPDocs inside
 'function_exists'

---
 fuel/modules/fuel/helpers/MY_array_helper.php | 157 +++---
 fuel/modules/fuel/helpers/MY_date_helper.php  | 408 +++++++-------
 .../fuel/helpers/MY_directory_helper.php      |  78 +--
 fuel/modules/fuel/helpers/MY_file_helper.php  |  70 +--
 fuel/modules/fuel/helpers/MY_html_helper.php  |  54 +-
 .../fuel/helpers/MY_language_helper.php       |  42 +-
 .../modules/fuel/helpers/MY_string_helper.php | 115 ++--
 fuel/modules/fuel/helpers/MY_url_helper.php   | 242 ++++----
 fuel/modules/fuel/helpers/ajax_helper.php     |  28 +-
 fuel/modules/fuel/helpers/asset_helper.php    | 346 ++++++------
 fuel/modules/fuel/helpers/browser_helper.php  |  16 +-
 .../fuel/helpers/compatibility_helper.php     |  85 +--
 fuel/modules/fuel/helpers/convert_helper.php  |  94 ++--
 fuel/modules/fuel/helpers/format_helper.php   |  16 +-
 fuel/modules/fuel/helpers/google_helper.php   | 120 ++--
 fuel/modules/fuel/helpers/scraper_helper.php  |  48 +-
 fuel/modules/fuel/helpers/session_helper.php  |  57 +-
 .../modules/fuel/helpers/simplepie_helper.php |  18 +-
 fuel/modules/fuel/helpers/social_helper.php   |  48 +-
 fuel/modules/fuel/helpers/utility_helper.php  |  96 ++--
 .../modules/fuel/helpers/validator_helper.php | 528 +++++++++---------
 21 files changed, 1332 insertions(+), 1334 deletions(-)

diff --git a/fuel/modules/fuel/helpers/MY_array_helper.php b/fuel/modules/fuel/helpers/MY_array_helper.php
index 9a52d6990..3e38ee15e 100644
--- a/fuel/modules/fuel/helpers/MY_array_helper.php
+++ b/fuel/modules/fuel/helpers/MY_array_helper.php
@@ -28,19 +28,18 @@
 
 // --------------------------------------------------------------------
 
-/**
- * An alternative array sorter that is a bit faster then array_sorter
- *
- * @access	public
- * @param	array 	The array of data
- * @param	string 	The column to sort by
- * @param	string 	The direction (asc/desc)
- * @return	array
- */
-
 if ( ! function_exists('array_orderby'))
 {
 	// http://php.net/manual/en/function.array-multisort.php
+	/**
+	 * An alternative array sorter that is a bit faster then array_sorter
+	 *
+	 * @access	public
+	 * @param	array 	The array of data
+	 * @param	string 	The column to sort by
+	 * @param	string 	The direction (asc/desc)
+	 * @return	array
+	 */
 	function array_orderby()
 	{
 		$args = func_get_args();
@@ -61,19 +60,19 @@ function array_orderby()
 
 // --------------------------------------------------------------------
 
-/**
- * Array sorter that will sort on an array's key and allows for asc/desc order
- *
- * @access	public
- * @param	array
- * @param	string
- * @param	string
- * @param	boolean
- * @param	boolean
- * @return	array
- */
 if ( ! function_exists('array_sorter'))
 {
+	/**
+	 * Array sorter that will sort on an array's key and allows for asc/desc order
+	 *
+	 * @access	public
+	 * @param	array
+	 * @param	string
+	 * @param	string
+	 * @param	boolean
+	 * @param	boolean
+	 * @return	array
+	 */
 	function array_sorter(&$array, $index, $order = 'asc', $nat_sort = FALSE, $case_sensitive = FALSE)
 	{
 		if(is_array($array) && count($array) > 0)
@@ -103,18 +102,18 @@ function array_sorter(&$array, $index, $order = 'asc', $nat_sort = FALSE, $case_
 
 // --------------------------------------------------------------------
 
-/**
- * Array sorter that will sort an array of objects based on an objects 
- * property and allows for asc/desc order. Changes the original object
- *
- * @access	public
- * @param	mixed
- * @param	string
- * @param	string
- * @return	NULL
- */
 if ( ! function_exists('object_sorter'))
 {
+	/**
+	 * Array sorter that will sort an array of objects based on an objects
+	 * property and allows for asc/desc order. Changes the original object
+	 *
+	 * @access	public
+	 * @param	mixed
+	 * @param	string
+	 * @param	string
+	 * @return	NULL
+	 */
 	function object_sorter(&$data, $key, $order = 'asc')
 	{
 		for ($i = count($data) - 1; $i >= 0; $i--)
@@ -152,21 +151,21 @@ function object_sorter(&$data, $key, $order = 'asc')
 
 // --------------------------------------------------------------------
 
-/**
- * Creates a key/value array based on an original array.
- *
- * Can be used in conjunction with the Form library class 
- * (e.g. $this->form->select('countries, option_list($options)))
- *
- * @access	public
- * @param	array
- * @param	string
- * @param	string
- * @param	boolean
- * @return	array
- */
 if ( ! function_exists('options_list'))
 {
+	/**
+	 * Creates a key/value array based on an original array.
+	 *
+	 * Can be used in conjunction with the Form library class
+	 * (e.g. $this->form->select('countries, option_list($options)))
+	 *
+	 * @access	public
+	 * @param	array
+	 * @param	string
+	 * @param	string
+	 * @param	boolean
+	 * @return	array
+	 */
 	function options_list($values, $value = 'id', $label = 'name', $value_as_key = FALSE)
 	{
 		$return = array();
@@ -192,15 +191,15 @@ function options_list($values, $value = 'id', $label = 'name', $value_as_key = F
 
 // --------------------------------------------------------------------
 
-/**
- * Parses a string in the format of key1="val1" key2="val2" into an array
- *
- * @access	public
- * @param	string
- * @return	array
- */
 if ( ! function_exists('parse_string_to_array'))
 {
+	/**
+	 * Parses a string in the format of key1="val1" key2="val2" into an array
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	array
+	 */
 	function parse_string_to_array($str)
 	{
 		preg_match_all('#(\w+)=([\'"])(.*)\\2#U', $str, $matches);
@@ -217,16 +216,16 @@ function parse_string_to_array($str)
 	}
 }
 
-/**
- * Returns an array of arrays.
- *
- * @access	public
- * @param	array an array to be divided
- * @param	int number of groups to divide the array into
- * @return	array
- */	
 if ( ! function_exists('array_group'))
 {
+	/**
+	 * Returns an array of arrays.
+	 *
+	 * @access	public
+	 * @param	array an array to be divided
+	 * @param	int number of groups to divide the array into
+	 * @return	array
+	 */
 	function array_group($array, $groups)
 	{
 		if (empty($array))
@@ -238,18 +237,18 @@ function array_group($array, $groups)
 	}
 }
 
-/**
- * Converts a .csv file to an associative array. Must have header row.
- *
- * @access	public
- * @param	string  file name
- * @param	string  the delimiter that separates each column
- * @param	int     the index for where the header row starts
- * @param	int     must be greater then the maximum line length. Setting to 0 is slightly slower, but works for any length
- * @return	array
- */	
 if ( ! function_exists('csv_to_array'))
 {
+	/**
+	 * Converts a .csv file to an associative array. Must have header row.
+	 *
+	 * @access	public
+	 * @param	string  file name
+	 * @param	string  the delimiter that separates each column
+	 * @param	int     the index for where the header row starts
+	 * @param	int     must be greater then the maximum line length. Setting to 0 is slightly slower, but works for any length
+	 * @return	array
+	 */
 	function csv_to_array($filename = '', $delimiter =  ',', $header_row = 0, $length = 0)
 	{
 		if(!file_exists($filename) || !is_readable($filename))
@@ -284,18 +283,18 @@ function csv_to_array($filename = '', $delimiter =  ',', $header_row = 0, $lengt
 
 // --------------------------------------------------------------------
 
-/**
- * Return the value from an associative array or an object.
- * credit: borrowed from Vanilla forums GetValueR function
- *
- * @access	public
- * @param 	mixed $array The array or object to search.
- * @param 	string $key The key or property name of the value.
- * @param 	mixed $default The value to return if the key does not exist.
- * @return 	mixed The value from the array or object.
- */
 if ( ! function_exists('array_get'))
 {
+	/**
+	 * Return the value from an associative array or an object.
+	 * credit: borrowed from Vanilla forums GetValueR function
+	 *
+	 * @access	public
+	 * @param 	mixed $array The array or object to search.
+	 * @param 	string $key The key or property name of the value.
+	 * @param 	mixed $default The value to return if the key does not exist.
+	 * @return 	mixed The value from the array or object.
+	 */
 	function array_get($array, $key, $default = FALSE)
 	{
 		$path = explode('.', $key);
diff --git a/fuel/modules/fuel/helpers/MY_date_helper.php b/fuel/modules/fuel/helpers/MY_date_helper.php
index 269c1dee3..b1068a395 100644
--- a/fuel/modules/fuel/helpers/MY_date_helper.php
+++ b/fuel/modules/fuel/helpers/MY_date_helper.php
@@ -29,16 +29,16 @@
 
 // --------------------------------------------------------------------
 
-/**
- * Returns the date into a specified format. Will look at the configuration
- *
- * @access	public'
- * @param	string
- * @param	mixed
- * @return	string
- */
 if (!function_exists('date_formatter'))
 {
+	/**
+	 * Returns the date into a specified format. Will look at the configuration
+	 *
+	 * @access	public'
+	 * @param	string
+	 * @param	mixed
+	 * @return	string
+	 */
 	function date_formatter($date, $format = FALSE)
 	{
 		$date_ts = strtotime($date);
@@ -65,15 +65,15 @@ function date_formatter($date, $format = FALSE)
 
 // --------------------------------------------------------------------
 
-/**
- * Returns the current datetime value in MySQL format
- *
- * @access	public
- * @param	boolean
- * @return	string
- */
 if (!function_exists('datetime_now'))
 {
+	/**
+	 * Returns the current datetime value in MySQL format
+	 *
+	 * @access	public
+	 * @param	boolean
+	 * @return	string
+	 */
 	function datetime_now($hms = TRUE)
 	{
 		if ($hms)
@@ -89,15 +89,15 @@ function datetime_now($hms = TRUE)
 
 // --------------------------------------------------------------------
 
-/**
- * Test for common date format
- *
- * @access	public
- * @param	string
- * @return	boolean
- */
 if (!function_exists('is_date_format'))
 {
+	/**
+	 * Test for common date format
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	boolean
+	 */
 	function is_date_format($date)
 	{
 		return (is_string($date) AND (!empty($date) AND (int)$date != 0) AND 
@@ -107,15 +107,15 @@ function is_date_format($date)
 
 // --------------------------------------------------------------------
 
-/**
- * Test for MySQL date format
- *
- * @access	public
- * @param	string
- * @return	boolean
- */
 if (!function_exists('is_date_db_format'))
 {
+	/**
+	 * Test for MySQL date format
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	boolean
+	 */
 	function is_date_db_format($date)
 	{
 		return preg_match("#([0-9]{4})-([0-9]{1,2})-([0-9]{1,2})#", $date);
@@ -124,15 +124,15 @@ function is_date_db_format($date)
 
 // --------------------------------------------------------------------
 
-/**
- * Test for mm/dd/yyyy format
- *
- * @access	public
- * @param	string
- * @return	boolean
- */
 if (!function_exists('is_date_english_format'))
 {
+	/**
+	 * Test for mm/dd/yyyy format
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	boolean
+	 */
 	function is_date_english_format($date)
 	{
 		return preg_match("#([0-9]{1,2})/([0-9]{1,2})/([0-9]{4})#", $date) OR preg_match("#([0-9]{1,2})-([0-9]{1,2})-([0-9]{4})#", $date);
@@ -141,19 +141,19 @@ function is_date_english_format($date)
 
 // --------------------------------------------------------------------
 
-/**
- * Returns date in mm/dd/yyy format by default
- * Can be configured with a date_format config value
- *
- * @access	public
- * @param	string
- * @param	boolean
- * @param	string
- * @param	string
- * @return	string
- */
 if (!function_exists('english_date'))
 {
+	/**
+	 * Returns date in mm/dd/yyy format by default
+	 * Can be configured with a date_format config value
+	 *
+	 * @access	public
+	 * @param	string
+	 * @param	boolean
+	 * @param	string
+	 * @param	string
+	 * @return	string
+	 */
 	function english_date($date, $long = FALSE, $timezone = NULL, $delimiter = '/')
 	{
 		if (!is_numeric($date) AND !preg_match("/([0-9]{4})-([0-9]{1,2})-([0-9]{1,2})/", $date, $regs))
@@ -183,16 +183,16 @@ function english_date($date, $long = FALSE, $timezone = NULL, $delimiter = '/')
 
 // --------------------------------------------------------------------
 
-/**
- * Returns date in 'verbose' (e.g. Jan. 1, 2010) format
- * Can be configured with a date_format_verbose config value
- *
- * @access	public
- * @param	string
- * @return	boolean
- */
 if (!function_exists('english_date_verbose'))
 {
+	/**
+	 * Returns date in 'verbose' (e.g. Jan. 1, 2010) format
+	 * Can be configured with a date_format_verbose config value
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	boolean
+	 */
 	function english_date_verbose($date)
 	{
 		$date_ts = (!is_numeric($date)) ? strtotime($date) : $date;
@@ -209,18 +209,18 @@ function english_date_verbose($date)
 
 // --------------------------------------------------------------------
 
-/**
- * Returns the time into a verbose format (e.g. 12hrs 10mins 10secs)
- *
- * must be passed a string in hh:mm format
- *
- * @access	public
- * @param	string
- * @param	boolean
- * @return	boolean
- */
 if (!function_exists('time_verbose'))
 {
+	/**
+	 * Returns the time into a verbose format (e.g. 12hrs 10mins 10secs)
+	 *
+	 * must be passed a string in hh:mm format
+	 *
+	 * @access	public
+	 * @param	string
+	 * @param	boolean
+	 * @return	boolean
+	 */
 	function time_verbose($time, $include_seconds = FALSE)
 	{
 		if (is_date_format($time))
@@ -247,19 +247,19 @@ function time_verbose($time, $include_seconds = FALSE)
 
 // --------------------------------------------------------------------
 
-/**
- * Converts a date from english (e.g. mm/dd/yyyy) to db format (e.g yyyy-mm-dd)
- *
- * @access	public
- * @param	string
- * @param	int
- * @param	int
- * @param	int
- * @param	string
- * @return	string
- */
 if (!function_exists('english_date_to_db_format'))
 {
+	/**
+	 * Converts a date from english (e.g. mm/dd/yyyy) to db format (e.g yyyy-mm-dd)
+	 *
+	 * @access	public
+	 * @param	string
+	 * @param	int
+	 * @param	int
+	 * @param	int
+	 * @param	string
+	 * @return	string
+	 */
 	function english_date_to_db_format($date, $hour = 0, $min = 0, $sec = 0, $ampm = 'am')
 	{
 		$hour = (int) $hour;
@@ -313,21 +313,21 @@ function english_date_to_db_format($date, $hour = 0, $min = 0, $sec = 0, $ampm =
 
 // --------------------------------------------------------------------
 
-/**
- * Formats a date into yyyy-mm-dd hh:mm:ss format
- *
- * @access	public
- * @param	int
- * @param	int
- * @param	int
- * @param	int
- * @param	int
- * @param	int
- * @return	string
- */
 // formats a date into a mysql date
 if (!function_exists('format_db_date'))
 {
+	/**
+	 * Formats a date into yyyy-mm-dd hh:mm:ss format
+	 *
+	 * @access	public
+	 * @param	int
+	 * @param	int
+	 * @param	int
+	 * @param	int
+	 * @param	int
+	 * @param	int
+	 * @return	string
+	 */
 	function format_db_date($y = NULL, $m = NULL, $d = NULL, $h = NULL, $i = NULL, $s = NULL)
 	{
 		if (empty($m) AND !empty($y))
@@ -364,17 +364,17 @@ function format_db_date($y = NULL, $m = NULL, $d = NULL, $h = NULL, $i = NULL, $
 
 // --------------------------------------------------------------------
 
-/**
- * Creates a date range string (e.g. January 1-10, 2010)
- *
- * @access	public
- * @param	string start date
- * @param	string end date
- * @param	array formatting parameters
- * @return	string
- */
 if (!function_exists('date_range_string'))
 {
+	/**
+	 * Creates a date range string (e.g. January 1-10, 2010)
+	 *
+	 * @access	public
+	 * @param	string start date
+	 * @param	string end date
+	 * @param	array formatting parameters
+	 * @return	string
+	 */
 	function date_range_string($date1, $date2, $params = array())
 	{
 		
@@ -431,18 +431,18 @@ function date_range_string($date1, $date2, $params = array())
 
 // --------------------------------------------------------------------
 
-/**
- * Creates a string based on how long from the current time the date provided.
- * 
- * (e.g. 10 minutes ago)
- *
- * @access	public
- * @param	string
- * @param	booelan
- * @return	string
- */
 if (!function_exists('pretty_date'))
 {
+	/**
+	 * Creates a string based on how long from the current time the date provided.
+	 *
+	 * (e.g. 10 minutes ago)
+	 *
+	 * @access	public
+	 * @param	string
+	 * @param	booelan
+	 * @return	string
+	 */
 	function pretty_date($timestamp, $use_gmt = FALSE)
 	{
 		if (is_string($timestamp))
@@ -496,16 +496,16 @@ function pretty_date($timestamp, $use_gmt = FALSE)
 
 // --------------------------------------------------------------------
 
-/**
- * Calculate the age between 2 dates
- *
- * @access	public
- * @param	int
- * @param	int
- * @return	string
- */
 if (!function_exists('get_age'))
 {
+	/**
+	 * Calculate the age between 2 dates
+	 *
+	 * @access	public
+	 * @param	int
+	 * @param	int
+	 * @return	string
+	 */
 	function get_age($bday_ts, $at_time_ts = NULL)  
 	{ 
 		if (empty($at_time_ts)) $at_time_ts = time();
@@ -528,19 +528,19 @@ function get_age($bday_ts, $at_time_ts = NULL)
 
 // ------------------------------------------------------------------------
 
-/**
- * Standard Date.. OVERWRITE CI version due to bugs
- *
- * Returns a date formatted according to the submitted standard.
- * http://codeigniter.com/forums/viewthread/171906/
- *
- * @access	public
- * @param	string	the chosen format
- * @param	int	Unix timestamp
- * @return	string
- */
 if (!function_exists('standard_date'))
 {
+	/**
+	 * Standard Date.. OVERWRITE CI version due to bugs
+	 *
+	 * Returns a date formatted according to the submitted standard.
+	 * http://codeigniter.com/forums/viewthread/171906/
+	 *
+	 * @access	public
+	 * @param	string	the chosen format
+	 * @param	int	Unix timestamp
+	 * @return	string
+	 */
 	function standard_date($fmt = 'DATE_RFC822', $time = '')
 	{
 		$formats = array(
@@ -566,15 +566,15 @@ function standard_date($fmt = 'DATE_RFC822', $time = '')
 
 // --------------------------------------------------------------------
 
-/**
- * Returns a timestamp from the provided time
- *
- * @access	public
- * @param	string date (optional)
- * @return	string
- */
 if (!function_exists('timestamp'))
 {
+	/**
+	 * Returns a timestamp from the provided time
+	 *
+	 * @access	public
+	 * @param	string date (optional)
+	 * @return	string
+	 */
 	function timestamp($date = NULL)
 	{
 		if (empty($date))
@@ -588,16 +588,16 @@ function timestamp($date = NULL)
 
 // --------------------------------------------------------------------
 
-/**
- * Returns a the month value of a provided date
- *
- * @access	public
- * @param	string date (optional)
- * @param	string options are 'm/numeric', 'F/long', 'M/short' <- default  (optional)
- * @return	string
- */
 if (!function_exists('month'))
 {
+	/**
+	 * Returns a the month value of a provided date
+	 *
+	 * @access	public
+	 * @param	string date (optional)
+	 * @param	string options are 'm/numeric', 'F/long', 'M/short' <- default  (optional)
+	 * @return	string
+	 */
 	function month($date = NULL, $format = 'M')
 	{
 		$ts = timestamp($date);
@@ -617,16 +617,16 @@ function month($date = NULL, $format = 'M')
 
 // --------------------------------------------------------------------
 
-/**
- * Returns a the day value of a provided date
- *
- * @access	public
- * @param	string date (optional)
- * @param	string options are 'd/leading', 'j' <- default  (optional)
- * @return	string
- */
 if (!function_exists('day'))
 {
+	/**
+	 * Returns a the day value of a provided date
+	 *
+	 * @access	public
+	 * @param	string date (optional)
+	 * @param	string options are 'd/leading', 'j' <- default  (optional)
+	 * @return	string
+	 */
 	function day($date = NULL, $format = 'j')
 	{
 		switch($format)
@@ -641,16 +641,16 @@ function day($date = NULL, $format = 'j')
 
 // --------------------------------------------------------------------
 
-/**
- * Returns a the weekday value of a provided date
- *
- * @access	public
- * @param	string date (optional)
- * @param	string options are 'l/full', 'N/numeric', 'D' <- default (optional)
- * @return	string
- */
 if (!function_exists('weekday'))
 {
+	/**
+	 * Returns a the weekday value of a provided date
+	 *
+	 * @access	public
+	 * @param	string date (optional)
+	 * @param	string options are 'l/full', 'N/numeric', 'D' <- default (optional)
+	 * @return	string
+	 */
 	function weekday($date = NULL, $format = 'D')
 	{
 		$ts = timestamp($date);
@@ -668,16 +668,16 @@ function weekday($date = NULL, $format = 'D')
 
 // --------------------------------------------------------------------
 
-/**
- * Returns a the year value of a provided date
- *
- * @access	public
- * @param	string date (optional)
- * @param	string options are 'y/short', 'Y/long' <- default (optional)
- * @return	string
- */
 if (!function_exists('year'))
 {
+	/**
+	 * Returns a the year value of a provided date
+	 *
+	 * @access	public
+	 * @param	string date (optional)
+	 * @param	string options are 'y/short', 'Y/long' <- default (optional)
+	 * @return	string
+	 */
 	function year($date = NULL, $format = 'Y')
 	{
 		$ts = timestamp($date);
@@ -693,16 +693,16 @@ function year($date = NULL, $format = 'Y')
 
 // --------------------------------------------------------------------
 
-/**
- * Returns a the weekday value of a provided date
- *
- * @access	public
- * @param	string date (optional)
- * @param	string options are '24/military', '12' <- default (optional)
- * @return	string
- */
 if (!function_exists('hour'))
 {
+	/**
+	 * Returns a the weekday value of a provided date
+	 *
+	 * @access	public
+	 * @param	string date (optional)
+	 * @param	string options are '24/military', '12' <- default (optional)
+	 * @return	string
+	 */
 	function hour($date = NULL, $format = '12')
 	{
 		$ts = timestamp($date);
@@ -718,16 +718,16 @@ function hour($date = NULL, $format = '12')
 
 // --------------------------------------------------------------------
 
-/**
- * Returns a the weekday value of a provided date
- *
- * @access	public
- * @param	string date (optional)
- * @param	string options are 'noleading', 'leading' <- default (optional)
- * @return	string
- */
 if (!function_exists('minute'))
 {
+	/**
+	 * Returns a the weekday value of a provided date
+	 *
+	 * @access	public
+	 * @param	string date (optional)
+	 * @param	string options are 'noleading', 'leading' <- default (optional)
+	 * @return	string
+	 */
 	function minute($date = NULL, $format = 'leading')
 	{
 		$min = date('i', timestamp($date));
@@ -741,16 +741,16 @@ function minute($date = NULL, $format = 'leading')
 
 // --------------------------------------------------------------------
 
-/**
- * Returns a the weekday value of a provided date
- *
- * @access	public
- * @param	string date (optional)
- * @param	string options are 'noleading', 'leading' <- default (optional)
- * @return	string
- */
 if (!function_exists('second'))
 {
+	/**
+	 * Returns a the weekday value of a provided date
+	 *
+	 * @access	public
+	 * @param	string date (optional)
+	 * @param	string options are 'noleading', 'leading' <- default (optional)
+	 * @return	string
+	 */
 	function second($date = NULL, $format = 'leading')
 	{
 		$sec = date('s', timestamp($date));
@@ -764,16 +764,16 @@ function second($date = NULL, $format = 'leading')
 
 // --------------------------------------------------------------------
 
-/**
- * Returns a the ampm value of a provided date
- *
- * @access	public
- * @param	string date (optional)
- * @param	string options are 'A/upper/uppercase', 'a/lower/lowercase' <- default (optional)
- * @return	string
- */
 if (!function_exists('ampm'))
 {
+	/**
+	 * Returns a the ampm value of a provided date
+	 *
+	 * @access	public
+	 * @param	string date (optional)
+	 * @param	string options are 'A/upper/uppercase', 'a/lower/lowercase' <- default (optional)
+	 * @return	string
+	 */
 	function ampm($date = NULL, $format = 'a')
 	{
 		$ts = timestamp($date);
@@ -789,15 +789,15 @@ function ampm($date = NULL, $format = 'a')
 
 // --------------------------------------------------------------------
 
-/**
- * Determines whether the time is midnight or not. Helps with dates that are set without time values
- *
- * @access	public
- * @param	string date
- * @return	string
- */
 if (!function_exists('is_midnight'))
 {
+	/**
+	 * Determines whether the time is midnight or not. Helps with dates that are set without time values
+	 *
+	 * @access	public
+	 * @param	string date
+	 * @return	string
+	 */
 	function is_midnight($date)
 	{
 		$ts = timestamp($date);
diff --git a/fuel/modules/fuel/helpers/MY_directory_helper.php b/fuel/modules/fuel/helpers/MY_directory_helper.php
index 95e0f9bc4..52b326d61 100644
--- a/fuel/modules/fuel/helpers/MY_directory_helper.php
+++ b/fuel/modules/fuel/helpers/MY_directory_helper.php
@@ -32,16 +32,16 @@
 
 // --------------------------------------------------------------------
 
-/**
- * Recursively copies from one directory to another
- *
- * @access	public
- * @param 	string
- * @param 	string
- * @return	array
- */
 if (!function_exists('copyr'))
 {
+	/**
+	 * Recursively copies from one directory to another
+	 *
+	 * @access	public
+	 * @param 	string
+	 * @param 	string
+	 * @return	array
+	 */
 	function copyr($source, $dest)
 	{
 		// Simple copy for a file
@@ -90,17 +90,17 @@ function copyr($source, $dest)
 
 // --------------------------------------------------------------------
 
-/**
- * Recursively changes the permissions of a folder structure
- *
- *  from php.net/chmod
- * @access	public
- * @param 	string
- * @param 	octal
- * @return	boolean
- */
 if (!function_exists('chmodr'))
 {
+	/**
+	 * Recursively changes the permissions of a folder structure
+	 *
+	 *  from php.net/chmod
+	 * @access	public
+	 * @param 	string
+	 * @param 	octal
+	 * @return	boolean
+	 */
 	function chmodr($path, $filemode) { 
 		if (!is_dir($path))
 		{
@@ -143,18 +143,18 @@ function chmodr($path, $filemode) {
 
 // --------------------------------------------------------------------
 
-/**
- * Returns an array of file names from a directory
- *
- * @access	public
- * @param 	string
- * @param 	boolean
- * @param 	mixed
- * @param 	boolean
- * @return	array
- */
 if (!function_exists('directory_to_array'))
 {
+	/**
+	 * Returns an array of file names from a directory
+	 *
+	 * @access	public
+	 * @param 	string
+	 * @param 	boolean
+	 * @param 	mixed
+	 * @param 	boolean
+	 * @return	array
+	 */
 	function directory_to_array($directory, $recursive = TRUE, $exclude = array(), $append_path = TRUE, $no_ext = FALSE, $_first_time = TRUE)
 	{
 		static $orig_directory;
@@ -198,20 +198,20 @@ function directory_to_array($directory, $recursive = TRUE, $exclude = array(), $
 
 // --------------------------------------------------------------------
 
-/**
- * Lists the directories only from a give directory
- *
- * @access	public
- * @param 	string
- * @param 	mixed
- * @param 	boolean
- * @param 	boolean
- * @param 	boolean
- * @param 	boolean
- * @return	array
- */
 if (!function_exists('list_directories'))
 {
+	/**
+	 * Lists the directories only from a give directory
+	 *
+	 * @access	public
+	 * @param 	string
+	 * @param 	mixed
+	 * @param 	boolean
+	 * @param 	boolean
+	 * @param 	boolean
+	 * @param 	boolean
+	 * @return	array
+	 */
 	function list_directories($directory, $exclude = array(), $full_path = TRUE, $is_writable = FALSE, $recursive = TRUE, $_first_time = TRUE)
 	{
 		static $orig_directory;
diff --git a/fuel/modules/fuel/helpers/MY_file_helper.php b/fuel/modules/fuel/helpers/MY_file_helper.php
index dba4af71f..5d28368f4 100644
--- a/fuel/modules/fuel/helpers/MY_file_helper.php
+++ b/fuel/modules/fuel/helpers/MY_file_helper.php
@@ -32,17 +32,17 @@
 
 // --------------------------------------------------------------------
 
-/**
- * Gets the directory file info.
- *
- * @access	public
- * @param 	string
- * @param 	boolean
- * @param 	boolean
- * @return	array
- */
 if (!function_exists('get_dir_file_info'))
 {
+	/**
+	 * Gets the directory file info.
+	 *
+	 * @access	public
+	 * @param 	string
+	 * @param 	boolean
+	 * @param 	boolean
+	 * @return	array
+	 */
 	function get_dir_file_info($source_dir, $top_level_only = TRUE, $include_path = FALSE, $_recursion = FALSE)
 	{
 		static $_filedata = array();
@@ -95,18 +95,18 @@ function get_dir_file_info($source_dir, $top_level_only = TRUE, $include_path =
 
 // --------------------------------------------------------------------
 
-/**
- * Deletes files in a directory with the added option to exclude certain files
- *
- * @access	public
- * @param 	string
- * @param 	boolean
- * @param 	mixed
- * @param 	int
- * @return	void
- */
 if (!function_exists('delete_files'))
 {
+	/**
+	 * Deletes files in a directory with the added option to exclude certain files
+	 *
+	 * @access	public
+	 * @param 	string
+	 * @param 	boolean
+	 * @param 	mixed
+	 * @param 	int
+	 * @return	void
+	 */
 	function delete_files($path, $del_dir = FALSE, $exclude = NULL, $level = 0)
 	{	
 		// Trim the trailing slash
@@ -145,17 +145,17 @@ function delete_files($path, $del_dir = FALSE, $exclude = NULL, $level = 0)
 
 // --------------------------------------------------------------------
 
-/**
- * Deletes files in a directory older then a certain date with the added option to exclude certain files
- *
- * @access	public
- * @param 	string
- * @param 	string
- * @param 	mixed
- * @return	void
- */
 if (!function_exists('delete_old_files'))
 {
+	/**
+	 * Deletes files in a directory older then a certain date with the added option to exclude certain files
+	 *
+	 * @access	public
+	 * @param 	string
+	 * @param 	string
+	 * @param 	mixed
+	 * @return	void
+	 */
 	function delete_old_files($dir, $older_than, $exclude = array())
 	{
 		$files = get_dir_file_info($dir);
@@ -178,15 +178,15 @@ function delete_old_files($dir, $older_than, $exclude = array())
 
 // --------------------------------------------------------------------
 
-/**
- * Determines if the file is an image
- *
- * @access	public
- * @param 	string
- * @return	boolean
- */
 if (!function_exists('is_image_file'))
 {
+	/**
+	 * Determines if the file is an image
+	 *
+	 * @access	public
+	 * @param 	string
+	 * @return	boolean
+	 */
 	function is_image_file($path)
 	{
 		if (preg_match("/.+\\.(jpg|jpeg|jpe|gif|png)$/i",$path))
diff --git a/fuel/modules/fuel/helpers/MY_html_helper.php b/fuel/modules/fuel/helpers/MY_html_helper.php
index 04eb10f05..21fc725e2 100644
--- a/fuel/modules/fuel/helpers/MY_html_helper.php
+++ b/fuel/modules/fuel/helpers/MY_html_helper.php
@@ -32,18 +32,18 @@
 
 // --------------------------------------------------------------------
 
-/**
- * Wrap an string or array of values in opening and closing tag
- *
- * @access	public
- * @param 	string 	opening tag element
- * @param 	string 	closing tag element
- * @param 	mixed 	array of values to be enclosed by tags  
- * @param	boolean	echo to the screen
- * @return	string
- */
 if (!function_exists('tag'))
 {
+	/**
+	 * Wrap an string or array of values in opening and closing tag
+	 *
+	 * @access	public
+	 * @param 	string 	opening tag element
+	 * @param 	string 	closing tag element
+	 * @param 	mixed 	array of values to be enclosed by tags
+	 * @param	boolean	echo to the screen
+	 * @return	string
+	 */
 	function tag($tag, $vals, $attrs = array())
 	{
 		$str = '';
@@ -69,18 +69,18 @@ function tag($tag, $vals, $attrs = array())
 
 // --------------------------------------------------------------------
 
-/**
- * Wrap a string into an HTML blockquote with quotes and cite added
- *
- * @access	public
- * @param 	string 	string to be enclosed by quote elements
- * @param 	string 	string source value
- * @param 	string 	string company/position value 
- * @param 	string 	string css class 
- * @return	string
- */
 if (!function_exists('quote'))
 {
+	/**
+	 * Wrap a string into an HTML blockquote with quotes and cite added
+	 *
+	 * @access	public
+	 * @param 	string 	string to be enclosed by quote elements
+	 * @param 	string 	string source value
+	 * @param 	string 	string company/position value
+	 * @param 	string 	string css class
+	 * @return	string
+	 */
 	function quote($quote, $cite = NULL, $title = NULL, $class = 'quote')
 	{
 		$str = '<blockquote';
@@ -109,15 +109,15 @@ function quote($quote, $cite = NULL, $title = NULL, $class = 'quote')
 
 // --------------------------------------------------------------------
 
-/**
- * Create HTML attributes
- *
- * @access	public
- * @param 	mixed 	HTML attributs
- * @return	string
- */
 if (!function_exists('html_attrs'))
 {
+	/**
+	 * Create HTML attributes
+	 *
+	 * @access	public
+	 * @param 	mixed 	HTML attributs
+	 * @return	string
+	 */
 	function html_attrs($attrs)
 	{
 		if (is_array($attrs))
diff --git a/fuel/modules/fuel/helpers/MY_language_helper.php b/fuel/modules/fuel/helpers/MY_language_helper.php
index b73ac67a4..38e24c730 100644
--- a/fuel/modules/fuel/helpers/MY_language_helper.php
+++ b/fuel/modules/fuel/helpers/MY_language_helper.php
@@ -32,16 +32,16 @@
 
 // --------------------------------------------------------------------
 
-/**
- * Get translated local strings with arguments. 
- * Overwrites CI langauge_helper to have a more useful args
- *
- * @param 	string
- * @param 	mixed
- * @return	string
- */
 if (!function_exists('lang'))
 {
+	/**
+	 * Get translated local strings with arguments.
+	 * Overwrites CI langauge_helper to have a more useful args
+	 *
+	 * @param 	string
+	 * @param 	mixed
+	 * @return	string
+	 */
 	function lang($key, $args = NULL)
 	{
 
@@ -69,15 +69,15 @@ function lang($key, $args = NULL)
 
 // --------------------------------------------------------------------
 
-/**
- * Creates an array or JSON aobject for your javascript files that need localization
- *
- * @param 	array
- * @param 	boolean
- * @return	string
- */
 if (!function_exists('json_lang'))
 {
+	/**
+	 * Creates an array or JSON aobject for your javascript files that need localization
+	 *
+	 * @param 	array
+	 * @param 	boolean
+	 * @return	string
+	 */
 	function json_lang($js_localized = array(), $return_json = TRUE)
 	{
 		
@@ -131,14 +131,14 @@ function json_lang($js_localized = array(), $return_json = TRUE)
 
 // --------------------------------------------------------------------
 
-/**
- * Detects any specified language settings pulling from the URI, query string and then the user's browser settings
- *
- * @param 	boolean	Determines whether to set the "langauge" config property
- * @return	string
- */
 if (!function_exists('detect_lang'))
 {
+	/**
+	 * Detects any specified language settings pulling from the URI, query string and then the user's browser settings
+	 *
+	 * @param 	boolean	Determines whether to set the "langauge" config property
+	 * @return	string
+	 */
 	function detect_lang($set_config = FALSE)
 	{
 		$CI =& get_instance();
diff --git a/fuel/modules/fuel/helpers/MY_string_helper.php b/fuel/modules/fuel/helpers/MY_string_helper.php
index 17bf96071..6c56b20bb 100644
--- a/fuel/modules/fuel/helpers/MY_string_helper.php
+++ b/fuel/modules/fuel/helpers/MY_string_helper.php
@@ -32,15 +32,15 @@
 
 // --------------------------------------------------------------------
 
-/**
- * Evaluates a strings PHP code. Used especially for outputing FUEL page data
- *
- * @param 	string 	string to evaluate
- * @param 	mixed 	variables to pass to the string
- * @return	string
- */
 if (!function_exists('eval_string'))
 {
+	/**
+	 * Evaluates a strings PHP code. Used especially for outputing FUEL page data
+	 *
+	 * @param 	string 	string to evaluate
+	 * @param 	mixed 	variables to pass to the string
+	 * @return	string
+	 */
 	function eval_string($str, $vars = array())
 	{
 		$CI =& get_instance();
@@ -69,17 +69,16 @@ function eval_string($str, $vars = array())
 
 // --------------------------------------------------------------------
 
-/**
- * Add an s to the end of s string based on the number 
- *
- * @param 	int 	number to compare against to determine if it needs to be plural
- * @param 	string 	string to evaluate
- * @param 	string 	plural value to add
- * @return	string
- */
-//
 if (!function_exists('pluralize'))
-{ 
+{
+	/**
+	 * Add an s to the end of s string based on the number
+	 *
+	 * @param 	int 	number to compare against to determine if it needs to be plural
+	 * @param 	string 	string to evaluate
+	 * @param 	string 	plural value to add
+	 * @return	string
+	 */
 	function pluralize($num, $str = '', $plural = 's')
 	{
 		if (is_array($num))
@@ -97,14 +96,14 @@ function pluralize($num, $str = '', $plural = 's')
 
 // --------------------------------------------------------------------
 
-/**
- * Strips extra whitespace from a string
- *
- * @param 	string
- * @return	string
- */
 if (!function_exists('strip_whitespace'))
 {
+	/**
+	 * Strips extra whitespace from a string
+	 *
+	 * @param 	string
+	 * @return	string
+	 */
 	function strip_whitespace($str)
 	{
 		return trim(preg_replace('/\s\s+|\n/m', '', $str));
@@ -113,14 +112,14 @@ function strip_whitespace($str)
 
 // --------------------------------------------------------------------
 
-/**
- * Trims extra whitespace from the end and beginning of a string on multiple lines
- *
- * @param 	string
- * @return	string
- */
 if (!function_exists('trim_multiline'))
 {
+	/**
+	 * Trims extra whitespace from the end and beginning of a string on multiple lines
+	 *
+	 * @param 	string
+	 * @return	string
+	 */
 	function trim_multiline($str)
 	{
 		return trim(implode("\n", array_map('trim', explode("\n", $str))));
@@ -129,15 +128,15 @@ function trim_multiline($str)
 
 // --------------------------------------------------------------------
 
-/**
- * Converts words to title case and allows for exceptions
- *
- * @param 	string 	string to evaluate
- * @param 	mixed 	variables to pass to the string
- * @return	string
- */
 if (!function_exists('smart_ucwords'))
 {
+	/**
+	 * Converts words to title case and allows for exceptions
+	 *
+	 * @param 	string 	string to evaluate
+	 * @param 	mixed 	variables to pass to the string
+	 * @return	string
+	 */
 	function smart_ucwords($str, $exceptions = array('of', 'the'))
 	{
 		$out = "";
@@ -153,17 +152,17 @@ function smart_ucwords($str, $exceptions = array('of', 'the'))
 
 // --------------------------------------------------------------------
 
-/**
- * Removes "Gremlin" characters 
- *
- * (hidden control characters that the remove_invisible_characters function misses)
- *
- * @param 	string 	string to evaluate
- * @param 	string 	the value used to replace a gremlin
- * @return	string
- */
 if (!function_exists('zap_gremlins'))
 {
+	/**
+	 * Removes "Gremlin" characters
+	 *
+	 * (hidden control characters that the remove_invisible_characters function misses)
+	 *
+	 * @param 	string 	string to evaluate
+	 * @param 	string 	the value used to replace a gremlin
+	 * @return	string
+	 */
 	function zap_gremlins($str, $replace = '')
 	{
 		// there is a hidden bullet looking thingy that photoshop likes to include in it's text'
@@ -175,14 +174,14 @@ function zap_gremlins($str, $replace = '')
 
 // --------------------------------------------------------------------
 
-/**
- * Removes javascript from a string
- *
- * @param 	string 	string to remove javascript
- * @return	string
- */
 if (!function_exists('strip_javascript'))
 {
+	/**
+	 * Removes javascript from a string
+	 *
+	 * @param 	string 	string to remove javascript
+	 * @return	string
+	 */
 	function strip_javascript($str)
 	{
 		$str = preg_replace('#<script[^>]*>.*?</script>#is', '', $str);
@@ -192,15 +191,15 @@ function strip_javascript($str)
 
 // --------------------------------------------------------------------
 
-/**
- * Safely converts a string's entities without encoding HTML tags and quotes
- *
- * @param 	string 	string to evaluate
- * @param 	boolean determines whether to encode the ampersand or not
- * @return	string
- */
 if (!function_exists('safe_htmlentities'))
 {
+	/**
+	 * Safely converts a string's entities without encoding HTML tags and quotes
+	 *
+	 * @param 	string 	string to evaluate
+	 * @param 	boolean determines whether to encode the ampersand or not
+	 * @return	string
+	 */
 	function safe_htmlentities($str, $protect_amp = TRUE)
 	{
 		// convert all hex single quotes to numeric ... 
diff --git a/fuel/modules/fuel/helpers/MY_url_helper.php b/fuel/modules/fuel/helpers/MY_url_helper.php
index 972dfdd92..dece02025 100644
--- a/fuel/modules/fuel/helpers/MY_url_helper.php
+++ b/fuel/modules/fuel/helpers/MY_url_helper.php
@@ -30,18 +30,18 @@
 
 // --------------------------------------------------------------------
 
-/**
- * This is just an alias to the normal CI site_url function but was added mainly to prevent conflicts with other systems like Wordpress (yes... sometimes the two need to be integrated)
- * Added simple return if the url begins with http
- *
- * @access	public
- * @param	string	the URI string
- * @param	boolean	sets or removes "https" from the URL. Must be set to TRUE or FALSE for it to explicitly work
- * @param	boolean	sets the language parameter on the URL based on the "language_mode" setting in the FUEL configuration
- * @return	string
- */
 if (!function_exists('url_to'))
 {
+	/**
+	 * This is just an alias to the normal CI site_url function but was added mainly to prevent conflicts with other systems like Wordpress (yes... sometimes the two need to be integrated)
+	 * Added simple return if the url begins with http
+	 *
+	 * @access	public
+	 * @param	string	the URI string
+	 * @param	boolean	sets or removes "https" from the URL. Must be set to TRUE or FALSE for it to explicitly work
+	 * @param	boolean	sets the language parameter on the URL based on the "language_mode" setting in the FUEL configuration
+	 * @return	string
+	 */
 	function url_to($uri = '', $https = NULL, $language = NULL)
 	{
 		if (is_http_path($uri)) return $uri;
@@ -77,17 +77,17 @@ function url_to($uri = '', $https = NULL, $language = NULL)
 
 // --------------------------------------------------------------------
 
-/**
- * Site URL which is an alias to the url_to function
- *
- * @access	public
- * @param	string	the URI string
- * @param	boolean	sets or removes "https" from the URL. Must be set to TRUE or FALSE for it to explicitly work
- * @param	boolean	sets the language parameter on the URL based on the "language_mode" setting in the FUEL configuration
- * @return	string
- */
 if (!function_exists('site_url'))
 {
+	/**
+	 * Site URL which is an alias to the url_to function
+	 *
+	 * @access	public
+	 * @param	string	the URI string
+	 * @param	boolean	sets or removes "https" from the URL. Must be set to TRUE or FALSE for it to explicitly work
+	 * @param	boolean	sets the language parameter on the URL based on the "language_mode" setting in the FUEL configuration
+	 * @return	string
+	 */
 	function site_url($uri = '', $https = NULL, $language = NULL)
 	{
 		return url_to($uri, $https, $language);
@@ -96,17 +96,17 @@ function site_url($uri = '', $https = NULL, $language = NULL)
 
 // --------------------------------------------------------------------
 
-/**
- * Current URL
- * Added show_query_str parameter
- *
- * @access	public
- * @param	boolean	determines whether to include query string parameters
- * @param	boolean	determines whether to change the language value
- * @return	string
- */
 if (!function_exists('current_url'))
 {
+	/**
+	 * Current URL
+	 * Added show_query_str parameter
+	 *
+	 * @access	public
+	 * @param	boolean	determines whether to include query string parameters
+	 * @param	boolean	determines whether to change the language value
+	 * @return	string
+	 */
 	function current_url($show_query_str = FALSE, $lang = NULL)
 	{
 		$CI =& get_instance();
@@ -122,17 +122,17 @@ function current_url($show_query_str = FALSE, $lang = NULL)
 
 // --------------------------------------------------------------------
 
-/**
- * Returns the uri path normalized
- *
- * @access	public
- * @param	boolean	use the rerouted URI string?
- * @param	boolean	the start index to build the uri path
- * @param	boolean	determines whether to strip any language segments
- * @return	string
- */
 if (!function_exists('uri_path'))
 {
+	/**
+	 * Returns the uri path normalized
+	 *
+	 * @access	public
+	 * @param	boolean	use the rerouted URI string?
+	 * @param	boolean	the start index to build the uri path
+	 * @param	boolean	determines whether to strip any language segments
+	 * @return	string
+	 */
 	function uri_path($rerouted = TRUE, $start_index = 0, $strip_lang = TRUE)
 	{
 		$CI =& get_instance();
@@ -162,18 +162,18 @@ function uri_path($rerouted = TRUE, $start_index = 0, $strip_lang = TRUE)
 
 // --------------------------------------------------------------------
 
-/**
- * Returns the uri segment
- *
- * @access	public
- * @param	int	the segment number
- * @param	string	the default value if the segment doesn't exist
- * @param	boolean	whether to use the rerouted uri
- * @param	boolean	determines whether to strip any language segments
- * @return	string
- */
 if (!function_exists('uri_segment'))
 {
+	/**
+	 * Returns the uri segment
+	 *
+	 * @access	public
+	 * @param	int	the segment number
+	 * @param	string	the default value if the segment doesn't exist
+	 * @param	boolean	whether to use the rerouted uri
+	 * @param	boolean	determines whether to strip any language segments
+	 * @return	string
+	 */
 	function uri_segment($n, $default = FALSE, $rerouted = TRUE, $strip_lang = TRUE)
 	{
 		$CI =& get_instance();
@@ -199,15 +199,15 @@ function uri_segment($n, $default = FALSE, $rerouted = TRUE, $strip_lang = TRUE)
 
 // --------------------------------------------------------------------
 
-/**
- * Helper function to determine if it is a local path
- *
- * @access	public
- * @param	string	URL
- * @return	string
- */
 if (!function_exists('is_http_path'))
 {
+	/**
+	 * Helper function to determine if it is a local path
+	 *
+	 * @access	public
+	 * @param	string	URL
+	 * @return	string
+	 */
 	function is_http_path($path)
 	{
 		return (preg_match('!^\w+://! i', $path));
@@ -216,14 +216,14 @@ function is_http_path($path)
 
 // --------------------------------------------------------------------
 
-/**
- * Determines if the page is the homepage or not
- *
- * @access	public
- * @return	boolean
- */
 if (!function_exists('is_home'))
 {
+	/**
+	 * Determines if the page is the homepage or not
+	 *
+	 * @access	public
+	 * @return	boolean
+	 */
 	function is_home($uri_path = NULL)
 	{
 		if (is_null($uri_path))
@@ -239,14 +239,14 @@ function is_home($uri_path = NULL)
 
 // --------------------------------------------------------------------
 
-/**
- * Determines if the page is 404
- *
- * @access	public
- * @return	boolean
- */
 if (!function_exists('is_404'))
 {
+	/**
+	 * Determines if the page is 404
+	 *
+	 * @access	public
+	 * @return	boolean
+	 */
 	function is_404()
 	{
 		return (http_response_code() == 404);
@@ -255,16 +255,16 @@ function is_404()
 
 // --------------------------------------------------------------------
 
-/**
- * Returns the last page you visited
- *
- * @access	public
- * @param	string	Default value if no last page exists
- * @param	boolean	Whether to return only the URI part of the the URL
- * @return	boolean
- */
 if (!function_exists('last_url'))
 {
+	/**
+	 * Returns the last page you visited
+	 *
+	 * @access	public
+	 * @param	string	Default value if no last page exists
+	 * @param	boolean	Whether to return only the URI part of the the URL
+	 * @return	boolean
+	 */
 	function last_url($default = FALSE, $only_uri = FALSE)
 	{
 		$back_url = (isset($_SERVER['HTTP_REFERER']) AND $_SERVER['HTTP_REFERER'] != current_url()) ? $_SERVER['HTTP_REFERER'] : $default;
@@ -291,16 +291,16 @@ function last_url($default = FALSE, $only_uri = FALSE)
 
 // --------------------------------------------------------------------
 
-/**
- * Will return a target="_blank" if the link is not from the same domain.
- *
- * @access	public
- * @param	string	URL
- * @param	array	An array of extensions to check to force it to target="_blank"
- * @return	boolean
- */
 if (!function_exists('link_target'))
 {
+	/**
+	 * Will return a target="_blank" if the link is not from the same domain.
+	 *
+	 * @access	public
+	 * @param	string	URL
+	 * @param	array	An array of extensions to check to force it to target="_blank"
+	 * @return	boolean
+	 */
 	function link_target($link, $exts = array())
 	{
 		$url_parts = parse_url($link);
@@ -350,15 +350,15 @@ function link_target($link, $exts = array())
 
 // --------------------------------------------------------------------
 
-/**
- * Checks the redirects before showing a 404
- *
- * @access	public
- * @param	boolean	Whether to redirect or not
- * @return	void
- */
 if (!function_exists('redirect_404'))
 {
+	/**
+	 * Checks the redirects before showing a 404
+	 *
+	 * @access	public
+	 * @param	boolean	Whether to redirect or not
+	 * @return	void
+	 */
 	function redirect_404($redirect = TRUE)
 	{
 		$CI =& get_instance();
@@ -368,23 +368,23 @@ function redirect_404($redirect = TRUE)
 
 // ------------------------------------------------------------------------
 
-/**
- * Header Redirect (Overwritten to account for adding HTTPS and adding language path in site_url function)
- *
- * Header redirect in two flavors
- * For very fine grained control over headers, you could use the Output
- * Library's set_header() function.
- *
- * @access	public
- * @param	string	the URL
- * @param	string	the method: location or redirect
- * @param	string	the http response code
- * @param	string	wether to force or not https
- * @param	boolean	wether add the language to the URI
- * @return	string
- */
 if (!function_exists('redirect'))
 {
+	/**
+	 * Header Redirect (Overwritten to account for adding HTTPS and adding language path in site_url function)
+	 *
+	 * Header redirect in two flavors
+	 * For very fine grained control over headers, you could use the Output
+	 * Library's set_header() function.
+	 *
+	 * @access	public
+	 * @param	string	the URL
+	 * @param	string	the method: location or redirect
+	 * @param	string	the http response code
+	 * @param	string	wether to force or not https
+	 * @param	boolean	wether add the language to the URI
+	 * @return	string
+	 */
 	function redirect($uri = '', $method = 'location', $http_response_code = 302, $https = NULL,  $language = FALSE)
 	{
 		if ( ! preg_match('#^https?://#i', $uri))
@@ -408,17 +408,17 @@ function redirect($uri = '', $method = 'location', $http_response_code = 302, $h
 }
 // ------------------------------------------------------------------------
 
-/**
- * Returns whether the current page is using SSL (https)
- *
- * @access	public
- * @param	string	the URL
- * @param	string	the method: location or redirect
- * @return	string
- */
 // used function exists to future proof it https://github.com/IT-Can/CodeIgniter/commit/98bc5d985b7119ff71b9f50a1b226559f647797a
 if ( ! function_exists('is_https'))
 {
+	/**
+	 * Returns whether the current page is using SSL (https)
+	 *
+	 * @access	public
+	 * @param	string	the URL
+	 * @param	string	the method: location or redirect
+	 * @return	string
+	 */
 	function is_https()
 	{
 		return ((!empty($_SERVER['HTTPS']) AND strtolower($_SERVER['HTTPS']) !== 'off'));
@@ -427,17 +427,17 @@ function is_https()
 
 // ------------------------------------------------------------------------
 
-/**
- * Returns a query string formatted
- *
- * @access	public
- * @param	array	an array of query string parameters to exclude
- * @param	boolean	determines whether to include posted variables in the query string
- * @param	boolean	determines whether to include the question mark
- * @return	string
- */
 if (!function_exists('query_str'))
 {
+	/**
+	 * Returns a query string formatted
+	 *
+	 * @access	public
+	 * @param	array	an array of query string parameters to exclude
+	 * @param	boolean	determines whether to include posted variables in the query string
+	 * @param	boolean	determines whether to include the question mark
+	 * @return	string
+	 */
 	function query_str($exclude = array(), $include_post = FALSE, $include_q = TRUE)
 	{
 		$CI =& get_instance();
diff --git a/fuel/modules/fuel/helpers/ajax_helper.php b/fuel/modules/fuel/helpers/ajax_helper.php
index f1772cc48..39c925b18 100644
--- a/fuel/modules/fuel/helpers/ajax_helper.php
+++ b/fuel/modules/fuel/helpers/ajax_helper.php
@@ -3,7 +3,7 @@
  * FUEL CMS
  * http://www.getfuelcms.com
  *
- * An open source Content Management System based on the 
+ * An open source Content Management System based on the
  * Codeigniter framework (http://codeigniter.com)
  *
  * @package		FUEL CMS
@@ -31,14 +31,14 @@
 
 // --------------------------------------------------------------------
 
-/**
- * Returns a boolean value based on whether the page was requested via AJAX or not
- *
- * @access	public
- * @return	boolean
- */	
 if (!function_exists('is_ajax'))
 {
+	/**
+	 * Returns a boolean value based on whether the page was requested via AJAX or not
+	 *
+	 * @access	public
+	 * @return	boolean
+	 */
 	function is_ajax()
 	{
 		return (isset($_SERVER['HTTP_X_REQUESTED_WITH']) && $_SERVER['HTTP_X_REQUESTED_WITH']=="XMLHttpRequest");
@@ -47,15 +47,15 @@ function is_ajax()
 
 // --------------------------------------------------------------------
 
-/**
- * Sets the HTTP headers for 
- *
- * @access	public
- * @param	boolean	Sets the no cache headers
- * @return	boolean
- */	
 if (!function_exists('json_headers'))
 {
+	/**
+	 * Sets the HTTP headers for
+	 *
+	 * @access	public
+	 * @param	boolean	Sets the no cache headers
+	 * @return	void
+	 */
 	function json_headers($no_cache = TRUE)
 	{
 		if ($no_cache)
diff --git a/fuel/modules/fuel/helpers/asset_helper.php b/fuel/modules/fuel/helpers/asset_helper.php
index ebf11ab82..f7f67d210 100644
--- a/fuel/modules/fuel/helpers/asset_helper.php
+++ b/fuel/modules/fuel/helpers/asset_helper.php
@@ -33,17 +33,17 @@
 
 // --------------------------------------------------------------------
 
-/**
- * Returns an image asset path
- *
- * @access	public
- * @param	string	image file name including extension
- * @param	string	module folder if any
- * @param	boolean	whether to include http://... at beginning
- * @return	string
- */	
 if (!function_exists('img_path'))
 {
+	/**
+	 * Returns an image asset path
+	 *
+	 * @access	public
+	 * @param	string	image file name including extension
+	 * @param	string	module folder if any
+	 * @param	boolean	whether to include http://... at beginning
+	 * @return	string
+	 */
 	function img_path($file = NULL, $module = NULL, $absolute = NULL)
 	{
 		$CI = _get_assets();
@@ -53,17 +53,17 @@ function img_path($file = NULL, $module = NULL, $absolute = NULL)
 
 // --------------------------------------------------------------------
 
-/**
- * Returns a css asset path
- *
- * @access	public
- * @param	string	css file name (extension not required)
- * @param	string	module folder if any
- * @param	boolean	whether to include http://... at beginning
- * @return	string
- */	
 if (!function_exists('css_path'))
 {
+	/**
+	 * Returns a css asset path
+	 *
+	 * @access	public
+	 * @param	string	css file name (extension not required)
+	 * @param	string	module folder if any
+	 * @param	boolean	whether to include http://... at beginning
+	 * @return	string
+	 */
 	function css_path($file = NULL, $module = NULL, $absolute = NULL)
 	{
 		$CI = _get_assets();
@@ -73,17 +73,17 @@ function css_path($file = NULL, $module = NULL, $absolute = NULL)
 
 // --------------------------------------------------------------------
 
-/**
- * Returns a js asset path
- *
- * @access	public
- * @param	string	javascript file name (extension not required)
- * @param	string	module folder if any
- * @param	boolean	whether to include http://... at beginning
- * @return	string
- */	
 if (!function_exists('js_path'))
 {
+	/**
+	 * Returns a js asset path
+	 *
+	 * @access	public
+	 * @param	string	javascript file name (extension not required)
+	 * @param	string	module folder if any
+	 * @param	boolean	whether to include http://... at beginning
+	 * @return	string
+	 */
 	function js_path($file = NULL, $module = NULL, $absolute = NULL)
 	{
 		$CI = _get_assets();
@@ -93,17 +93,17 @@ function js_path($file = NULL, $module = NULL, $absolute = NULL)
 
 // --------------------------------------------------------------------
 
-/**
- * Returns a swf asset path
- *
- * @access	public
- * @param	string	swf file name (extension not required)
- * @param	string	module folder if any
- * @param	boolean	whether to include http://... at beginning
- * @return	string
- */	
 if (!function_exists('swf_path'))
 {
+	/**
+	 * Returns a swf asset path
+	 *
+	 * @access	public
+	 * @param	string	swf file name (extension not required)
+	 * @param	string	module folder if any
+	 * @param	boolean	whether to include http://... at beginning
+	 * @return	string
+	 */
 	function swf_path($file = NULL, $module = NULL, $absolute = NULL)
 	{
 		$CI = _get_assets();
@@ -113,17 +113,17 @@ function swf_path($file = NULL, $module = NULL, $absolute = NULL)
 
 // --------------------------------------------------------------------
 
-/**
- * Returns a pdf asset path
- *
- * @access	public
- * @param	string	pdf file name (extension not required)
- * @param	string	module folder if any
- * @param	boolean	whether to include http://... at beginning
- * @return	string
- */	
 if (!function_exists('pdf_path'))
 {
+	/**
+	 * Returns a pdf asset path
+	 *
+	 * @access	public
+	 * @param	string	pdf file name (extension not required)
+	 * @param	string	module folder if any
+	 * @param	boolean	whether to include http://... at beginning
+	 * @return	string
+	 */
 	function pdf_path($file = NULL, $module = NULL, $absolute = NULL)
 	{
 		$CI = _get_assets();
@@ -133,17 +133,17 @@ function pdf_path($file = NULL, $module = NULL, $absolute = NULL)
 
 // --------------------------------------------------------------------
 
-/**
- * Returns a media asset path (e.g. quicktime .mov)
- *
- * @access	public
- * @param	string	pdf file name including extension
- * @param	string	module folder if any
- * @param	boolean	whether to include http://... at beginning
- * @return	string
- */	
 if (!function_exists('media_path'))
 {
+	/**
+	 * Returns a media asset path (e.g. quicktime .mov)
+	 *
+	 * @access	public
+	 * @param	string	pdf file name including extension
+	 * @param	string	module folder if any
+	 * @param	boolean	whether to include http://... at beginning
+	 * @return	string
+	 */
 	function media_path($file = NULL, $module = NULL, $absolute = NULL)
 	{
 		$CI = _get_assets();
@@ -153,17 +153,17 @@ function media_path($file = NULL, $module = NULL, $absolute = NULL)
 
 // --------------------------------------------------------------------
 
-/**
- * Returns a document asset path (e.g. doc, docx)
- *
- * @access	public
- * @param	string	docs file name including extension
- * @param	string	module folder if any
- * @param	boolean	whether to include http://... at beginning
- * @return	string
- */	
 if (!function_exists('docs_path'))
 {
+	/**
+	 * Returns a document asset path (e.g. doc, docx)
+	 *
+	 * @access	public
+	 * @param	string	docs file name including extension
+	 * @param	string	module folder if any
+	 * @param	boolean	whether to include http://... at beginning
+	 * @return	string
+	 */
 	function docs_path($file = NULL, $module = NULL, $absolute = NULL)
 	{
 		$CI = _get_assets();
@@ -173,17 +173,17 @@ function docs_path($file = NULL, $module = NULL, $absolute = NULL)
 
 // --------------------------------------------------------------------
 
-/**
- * Returns a cache asset path
- *
- * @access	public
- * @param	string	cached file name including extension
- * @param	string	module folder if any
- * @param	boolean	whether to include http://... at beginning
- * @return	string
- */	
 if (!function_exists('cache_path'))
 {
+	/**
+	 * Returns a cache asset path
+	 *
+	 * @access	public
+	 * @param	string	cached file name including extension
+	 * @param	string	module folder if any
+	 * @param	boolean	whether to include http://... at beginning
+	 * @return	string
+	 */
 	function cache_path($file = NULL, $module = NULL, $absolute = NULL)
 	{
 		$CI = _get_assets();
@@ -193,17 +193,17 @@ function cache_path($file = NULL, $module = NULL, $absolute = NULL)
 
 // --------------------------------------------------------------------
 
-/**
- * Returns a captcha image path
- *
- * @access	public
- * @param	string	captcha file name including extension
- * @param	string	module folder if any
- * @param	boolean	whether to include http://... at beginning
- * @return	string
- */	
 if (!function_exists('captcha_path'))
 {
+	/**
+	 * Returns a captcha image path
+	 *
+	 * @access	public
+	 * @param	string	captcha file name including extension
+	 * @param	string	module folder if any
+	 * @param	boolean	whether to include http://... at beginning
+	 * @return	string
+	 */
 	function captcha_path($file = NULL, $module = NULL, $absolute = NULL)
 	{
 		$CI = _get_assets();
@@ -213,18 +213,18 @@ function captcha_path($file = NULL, $module = NULL, $absolute = NULL)
 
 // --------------------------------------------------------------------
 
-/**
- * Returns an asset path and is what the others above use
- *
- * @access	public
- * @param	string	asset file name including extension
- * @param	string	subfolder to asset file (e.g. images, js, css... etc)
- * @param	string	module folder if any
- * @param	boolean	whether to include http://... at beginning
- * @return	string
- */	
 if (!function_exists('assets_path'))
 {
+	/**
+	 * Returns an asset path and is what the others above use
+	 *
+	 * @access	public
+	 * @param	string	asset file name including extension
+	 * @param	string	subfolder to asset file (e.g. images, js, css... etc)
+	 * @param	string	module folder if any
+	 * @param	boolean	whether to include http://... at beginning
+	 * @return	string
+	 */
 	function assets_path($file = NULL, $path = NULL, $module = NULL,  $absolute = NULL)
 	{
 		$CI = _get_assets();
@@ -234,17 +234,17 @@ function assets_path($file = NULL, $path = NULL, $module = NULL,  $absolute = NU
 
 // --------------------------------------------------------------------
 
-/**
- * Get the server path
- *
- * @access	public
- * @param	string	asset file name including extension
- * @param	string	subfolder to asset file (e.g. images, js, css... etc)
- * @param	string	module folder if any
- * @return	string
- */	
 if (!function_exists('assets_server_path'))
 {
+	/**
+	 * Get the server path
+	 *
+	 * @access	public
+	 * @param	string	asset file name including extension
+	 * @param	string	subfolder to asset file (e.g. images, js, css... etc)
+	 * @param	string	module folder if any
+	 * @return	string
+	 */
 	function assets_server_path($file = NULL, $path = NULL, $module = NULL)
 	{
 		$CI = _get_assets();
@@ -254,15 +254,15 @@ function assets_server_path($file = NULL, $path = NULL, $module = NULL)
 
 // --------------------------------------------------------------------
 
-/**
- * Convert a server path to a web path
- *
- * @access	public
- * @param	string	server path to asset file
- * @return	string
- */	
 if (!function_exists('assets_server_to_web_path'))
 {
+	/**
+	 * Convert a server path to a web path
+	 *
+	 * @access	public
+	 * @param	string	server path to asset file
+	 * @return	string
+	 */
 	function assets_server_to_web_path($file, $truncate_to_asset_folder = FALSE)
 	{
 		$CI = _get_assets();
@@ -272,17 +272,17 @@ function assets_server_to_web_path($file, $truncate_to_asset_folder = FALSE)
 
 // --------------------------------------------------------------------
 
-/**
- * Returns a boolean value of whether a file exists
- *
- * @access	public
- * @param	string	asset file name including extension
- * @param	string	subfolder to asset file (e.g. images, js, css... etc)
- * @param	string	module folder if any
- * @return	boolean
- */	
 if (!function_exists('asset_exists'))
 {
+	/**
+	 * Returns a boolean value of whether a file exists
+	 *
+	 * @access	public
+	 * @param	string	asset file name including extension
+	 * @param	string	subfolder to asset file (e.g. images, js, css... etc)
+	 * @param	string	module folder if any
+	 * @return	boolean
+	 */
 	function asset_exists($file = NULL, $path = NULL, $module = NULL)
 	{
 		$CI = _get_assets();
@@ -292,18 +292,18 @@ function asset_exists($file = NULL, $path = NULL, $module = NULL)
 
 // --------------------------------------------------------------------
 
-/**
- * Returns the file size of an asset
- *
- * @access	public
- * @param	string	asset file name including extension
- * @param	string	subfolder to asset file (e.g. images, js, css... etc)
- * @param	string	module folder if any
- * @param	boolean	format
- * @return	string
- */	
 if (!function_exists('asset_filesize'))
 {
+	/**
+	 * Returns the file size of an asset
+	 *
+	 * @access	public
+	 * @param	string	asset file name including extension
+	 * @param	string	subfolder to asset file (e.g. images, js, css... etc)
+	 * @param	string	module folder if any
+	 * @param	boolean	format
+	 * @return	string
+	 */
 	function asset_filesize($file = NULL, $path = NULL, $module = NULL, $format = FALSE)
 	{
 		$CI = _get_assets();
@@ -313,16 +313,16 @@ function asset_filesize($file = NULL, $path = NULL, $module = NULL, $format = FA
 
 // --------------------------------------------------------------------
 
-/**
- * Creates javascript code that first tries to pull in jquery from the Google CDN, and if it doesn't exist, goes to the local backup version
- *
- * @access	public
- * @param	string	jQuery version number for Google CDN
- * @param	string	local asset path to default version
- * @return	string
- */	
 if (!function_exists('jquery'))
 {
+	/**
+	 * Creates javascript code that first tries to pull in jquery from the Google CDN, and if it doesn't exist, goes to the local backup version
+	 *
+	 * @access	public
+	 * @param	string	jQuery version number for Google CDN
+	 * @param	string	local asset path to default version
+	 * @return	string
+	 */
 	function jquery($version = '1.7.1', $default = 'jquery')
 	{
 		$CI = _get_assets();
@@ -332,17 +332,17 @@ function jquery($version = '1.7.1', $default = 'jquery')
 
 // --------------------------------------------------------------------
 
-/**
- * Inserts <script ...></script> tags based on configuration settings for js file path
- *
- * @access	public
- * @param	string	file name(s) of the JS files (.css extension is not needed). Can be an array or comma separated list.
- * @param	string	module module folder if any
- * @param	array	additional parameter to include (attrs, ie_conditional, and output)
- * @return	string
- */	
 if (!function_exists('js'))
 {
+	/**
+	 * Inserts <script ...></script> tags based on configuration settings for js file path
+	 *
+	 * @access	public
+	 * @param	string	file name(s) of the JS files (.css extension is not needed). Can be an array or comma separated list.
+	 * @param	string	module module folder if any
+	 * @param	array	additional parameter to include (attrs, ie_conditional, and output)
+	 * @return	string
+	 */
 	function js($path, $module = '', $options = array())
 	{
 		$CI = _get_assets();
@@ -352,17 +352,17 @@ function js($path, $module = '', $options = array())
 
 // --------------------------------------------------------------------
 
-/**
- * Inserts <link ... /> tags based on configuration settings for css file path
- *
- * @access	public
- * @param	string	file name(s) of the CSS files (.css extension is not needed). Can be an array or comma separated list.
- * @param	string	module module folder if any
- * @param	array	additional parameter to include (attrs, ie_conditional, and output)
- * @return	string
- */	
 if (!function_exists('css'))
 {
+	/**
+	 * Inserts <link ... /> tags based on configuration settings for css file path
+	 *
+	 * @access	public
+	 * @param	string	file name(s) of the CSS files (.css extension is not needed). Can be an array or comma separated list.
+	 * @param	string	module module folder if any
+	 * @param	array	additional parameter to include (attrs, ie_conditional, and output)
+	 * @return	string
+	 */
 	function css($path, $module = '', $options = array())
 	{
 		$CI = _get_assets();
@@ -372,17 +372,17 @@ function css($path, $module = '', $options = array())
 
 // --------------------------------------------------------------------
 
-/**
- * Returns an swf asset path
- *
- * @access	public
- * @param	string	file name of the swf file including extension
- * @param	string	module module folder if any
- * @param	array	additional parameter to include (attrs, ie_conditional, and output)
- * @return	string
- */	
 if (!function_exists('swf'))
 {
+	/**
+	 * Returns an swf asset path
+	 *
+	 * @access	public
+	 * @param	string	file name of the swf file including extension
+	 * @param	string	module module folder if any
+	 * @param	array	additional parameter to include (attrs, ie_conditional, and output)
+	 * @return	string
+	 */
 	function swf($flash, $id, $width, $height, $options = array()){
 		$CI = _get_assets();
 		return $CI->asset->swf($flash, $id, $width, $height, $options);
@@ -391,19 +391,19 @@ function swf($flash, $id, $width, $height, $options = array()){
 
 // --------------------------------------------------------------------
 
-/**
- * Uses the "http://placehold.it" service to display images (good for mocking up sites)
- *
- * @access	public
- * @param	int		width of placeholder image (optional)
- * @param	int		height of placeholder image (optional)
- * @param	string	text to display inside placeholder
- * @param	string	color of placeholder
- * @param	boolean	determines whether to wrap it in an image tag or just return the path (optional)
- * @return	string
- */	
 if (!function_exists('placeholder'))
 {
+	/**
+	 * Uses the "http://placehold.it" service to display images (good for mocking up sites)
+	 *
+	 * @access	public
+	 * @param	int		width of placeholder image (optional)
+	 * @param	int		height of placeholder image (optional)
+	 * @param	string	text to display inside placeholder
+	 * @param	string	color of placeholder
+	 * @param	boolean	determines whether to wrap it in an image tag or just return the path (optional)
+	 * @return	string
+	 */
 	function placeholder($width = 100, $height = '', $text = '', $colors = '', $img_tag = FALSE)
 	{
 		$dimentions = $width.( !empty($height) ? 'x'.$height : '');
@@ -426,7 +426,7 @@ function placeholder($width = 100, $height = '', $text = '', $colors = '', $img_
  *
  * @access	public
  * @return	CI super object
- */	
+ */
 function _get_assets()
 {
 	$CI =& get_instance();
diff --git a/fuel/modules/fuel/helpers/browser_helper.php b/fuel/modules/fuel/helpers/browser_helper.php
index 222e58959..522a23f21 100644
--- a/fuel/modules/fuel/helpers/browser_helper.php
+++ b/fuel/modules/fuel/helpers/browser_helper.php
@@ -29,16 +29,16 @@
 
 // --------------------------------------------------------------------
 
-/**
- * Returns an array of browser information
- * Originally from: http://us3.php.net/function.get-browser
- * 
- * @access	public
- * @param	string	browser agant (optional)
- * @return	array
- */	
 if (!function_exists('browser_info'))
 {
+	/**
+	 * Returns an array of browser information
+	 * Originally from: http://us3.php.net/function.get-browser
+	 *
+	 * @access	public
+	 * @param	string	browser agant (optional)
+	 * @return	array
+	 */
 	function browser_info($agent = NULL)
 	{
 	 	// Declare known browsers to look for
diff --git a/fuel/modules/fuel/helpers/compatibility_helper.php b/fuel/modules/fuel/helpers/compatibility_helper.php
index ff5fe012a..ea002e2f3 100644
--- a/fuel/modules/fuel/helpers/compatibility_helper.php
+++ b/fuel/modules/fuel/helpers/compatibility_helper.php
@@ -30,17 +30,17 @@
 
 // --------------------------------------------------------------------
 
-/**
- * Used for older versions of PHP that don't support json_encode.
- * another option http://derekallard.com/blog/post/using-json-on-servers-without-native-support/
- * Original function found here: http://php.net/manual/en/function.json-encode.php
- *
- * @access	public
- * @param	mixed	php value to encode into JSON format
- * @return	string
- */
 if (!function_exists('json_encode'))
 {
+	/**
+	 * Used for older versions of PHP that don't support json_encode.
+	 * another option http://derekallard.com/blog/post/using-json-on-servers-without-native-support/
+	 * Original function found here: http://php.net/manual/en/function.json-encode.php
+	 *
+	 * @access	public
+	 * @param	mixed	php value to encode into JSON format
+	 * @return	string
+	 */
 	function json_encode($a=FALSE)
 	{
 		if (is_null($a)) return 'null';
@@ -87,16 +87,17 @@ function json_encode($a=FALSE)
 
 // --------------------------------------------------------------------
 
-/**
- * Used for older versions of PHP that don't support json_decode.
- * another option http://derekallard.com/blog/post/using-json-on-servers-without-native-support/
- * Original function found here: http://php.net/manual/en/function.json-decode.php
- *
- * @access	public
- * @param	string	json formatted string
- * @return	mixed
- */
-if ( !function_exists('json_decode')){ 
+if ( !function_exists('json_decode'))
+{
+	/**
+	 * Used for older versions of PHP that don't support json_decode.
+	 * another option http://derekallard.com/blog/post/using-json-on-servers-without-native-support/
+	 * Original function found here: http://php.net/manual/en/function.json-decode.php
+	 *
+	 * @access	public
+	 * @param	string	json formatted string
+	 * @return	mixed
+	 */
 	function json_decode($json) 
 	{  
 		// Author: walidator.info 2009 
@@ -140,19 +141,19 @@ function json_decode($json)
 
 // ------------------------------------------------------------------------
 
-/**
- * Used for older versions of PHP that don't support str_getcsv.
- * Original function found here: http://php.net/manual/en/function.str-getcsv.php
- *
- * @access	public
- * @param	string
- * @param	string
- * @param	string
- * @param	string
- * @return	mixed
- */
 if (!function_exists('str_getcsv'))
-{ 
+{
+	/**
+	 * Used for older versions of PHP that don't support str_getcsv.
+	 * Original function found here: http://php.net/manual/en/function.str-getcsv.php
+	 *
+	 * @access	public
+	 * @param	string
+	 * @param	string
+	 * @param	string
+	 * @param	string
+	 * @return	mixed
+	 */
 	function str_getcsv($input, $delimiter = ",", $enclosure = '"', $escape = "\\")
 	{ 
 		$fiveMBs = 5 * 1024 * 1024; 
@@ -169,19 +170,19 @@ function str_getcsv($input, $delimiter = ",", $enclosure = '"', $escape = "\\")
 
 // --------------------------------------------------------------------
 
-/**
- * Not really a compatibility function since it doesn't exist natively in PHP.
- * However it probably should so we provide it here.
- * A version of the original function found here: http://glossword.googlecode.com/svn-history/r600/trunk/core/gw_includes/functions.php
- *
- * @access	public
- * @param	string
- * @param	string
- * @param	string
- * @return	mixed
- */
 if(!function_exists('str_putcsv'))
 {
+	/**
+	 * Not really a compatibility function since it doesn't exist natively in PHP.
+	 * However it probably should so we provide it here.
+	 * A version of the original function found here: http://glossword.googlecode.com/svn-history/r600/trunk/core/gw_includes/functions.php
+	 *
+	 * @access	public
+	 * @param	string
+	 * @param	string
+	 * @param	string
+	 * @return	mixed
+	 */
 	function str_putcsv($input, $delimiter = ',', $enclosure = '"')
 	{
 		// Open a memory "file" for read/write...
diff --git a/fuel/modules/fuel/helpers/convert_helper.php b/fuel/modules/fuel/helpers/convert_helper.php
index a67f4597c..851dd2fa2 100644
--- a/fuel/modules/fuel/helpers/convert_helper.php
+++ b/fuel/modules/fuel/helpers/convert_helper.php
@@ -32,15 +32,15 @@
 
 // --------------------------------------------------------------------
 
-/**
- * Convert ascii characters to hex values
- *
- * @access	public
- * @param	string	string containing ascii characters
- * @return	string
- */	
 if (!function_exists('ascii_to_hex'))
 {
+	/**
+	 * Convert ascii characters to hex values
+	 *
+	 * @access	public
+	 * @param	string	string containing ascii characters
+	 * @return	string
+	 */
 	function ascii_to_hex($ascii)
 	{
 		$hex = '';
@@ -55,15 +55,15 @@ function ascii_to_hex($ascii)
 
 // --------------------------------------------------------------------
 
-/**
- * Convert ascii characters to hex values
- *
- * @access	public
- * @param	string	string containing ascii characters
- * @return	string
- */	   
 if (!function_exists('hex_to_ascii'))
 {
+	/**
+	 * Convert ascii characters to hex values
+	 *
+	 * @access	public
+	 * @param	string	string containing ascii characters
+	 * @return	string
+	 */
 	function hex_to_ascii($hex)
 	{
 		$ascii = '';
@@ -83,16 +83,16 @@ function hex_to_ascii($hex)
 
 // --------------------------------------------------------------------
 
-/**
- * Convert a string into a safe, encoded uri value
- *
- * @access	public
- * @param	string	string to be converted
- * @param	boolean	convert to hex value 
- * @return	string
- */
 if (!function_exists('uri_safe_encode'))
 {
+	/**
+	 * Convert a string into a safe, encoded uri value
+	 *
+	 * @access	public
+	 * @param	string	string to be converted
+	 * @param	boolean	convert to hex value
+	 * @return	string
+	 */
 	function uri_safe_encode($str, $hexify = TRUE)
 	{
 		$str = ($hexify) ? ascii_to_hex(base64_encode($str)) : base64_encode($str);
@@ -102,16 +102,16 @@ function uri_safe_encode($str, $hexify = TRUE)
 
 // --------------------------------------------------------------------
 
-/**
- * Decode a base64 encoded string
- *
- * @access	public
- * @param	string	string to be converted
- * @param	boolean	value is hexified 
- * @return	string
- */
 if (!function_exists('uri_safe_decode'))
 {
+	/**
+	 * Decode a base64 encoded string
+	 *
+	 * @access	public
+	 * @param	string	string to be converted
+	 * @param	boolean	value is hexified
+	 * @return	string
+	 */
 	function uri_safe_decode($str, $hexify = TRUE)
 	{
 		$str = ($hexify) ? base64_decode(hex_to_ascii($str)) : base64_decode($str);
@@ -121,16 +121,16 @@ function uri_safe_decode($str, $hexify = TRUE)
 
 // --------------------------------------------------------------------
 
-/**
- * Encode a key/value array or string into a URI safe value
- *
- * @access	public
- * @param	string	string to be converted
- * @param	boolean	value is hexified 
- * @return	string
- */
 if (!function_exists('uri_safe_batch_encode'))
 {
+	/**
+	 * Encode a key/value array or string into a URI safe value
+	 *
+	 * @access	public
+	 * @param	string	string to be converted
+	 * @param	boolean	value is hexified
+	 * @return	string
+	 */
 	function uri_safe_batch_encode($uri, $delimiter = '|', $hexify = TRUE)
 	{
 		$str = '';
@@ -159,17 +159,17 @@ function uri_safe_batch_encode($uri, $delimiter = '|', $hexify = TRUE)
 
 // --------------------------------------------------------------------
 
-/**
- * Decode a key/value array or string into a URI safe value
- *
- * @access	public
- * @param	string	string to be converted
- * @param	string	delimiter to split string 
- * @param	boolean	value is hexified 
- * @return	string
- */
 if (!function_exists('uri_safe_batch_decode'))
 {
+	/**
+	 * Decode a key/value array or string into a URI safe value
+	 *
+	 * @access	public
+	 * @param	string	string to be converted
+	 * @param	string	delimiter to split string
+	 * @param	boolean	value is hexified
+	 * @return	string
+	 */
 	function uri_safe_batch_decode($str, $delimiter = '|', $hexify = TRUE)
 	{
 		$str = uri_safe_decode($str, $hexify);
diff --git a/fuel/modules/fuel/helpers/format_helper.php b/fuel/modules/fuel/helpers/format_helper.php
index 65619c99e..414491cc6 100644
--- a/fuel/modules/fuel/helpers/format_helper.php
+++ b/fuel/modules/fuel/helpers/format_helper.php
@@ -30,16 +30,16 @@
 
 // ------------------------------------------------------------------------
 
-/**
- * Formats value into a currency string
- *
- * @access	public
- * @param	string
- * @param	bool	whether to include the cents or not
- * @return	string
- */
 if (!function_exists('currency'))
 {
+	/**
+	 * Formats value into a currency string
+	 *
+	 * @access	public
+	 * @param	string
+	 * @param	bool	whether to include the cents or not
+	 * @return	string
+	 */
 	function currency($value, $symbol = '$',  $include_cents = TRUE, $decimal_sep = '.', $thousands_sep = ',')
 	{
 		if (!isset($value) OR $value === "")
diff --git a/fuel/modules/fuel/helpers/google_helper.php b/fuel/modules/fuel/helpers/google_helper.php
index ca75495d5..94de4cbf6 100644
--- a/fuel/modules/fuel/helpers/google_helper.php
+++ b/fuel/modules/fuel/helpers/google_helper.php
@@ -28,22 +28,22 @@
 
 // --------------------------------------------------------------------
 
-/**
-* Google Universal Analytics
-*
-* Inserts google universal analytics tracking code into view
-* If a tracking code is passed in, then it will use that uacct info
-* Otherwise, it will use the value defined in the google.php config file
-* If both values do not exist, nothing will be inserted.
-*
-* @access    public
-* @param    string	The google account number (optional)
-* @param    mixed	An array or string of extra parameters to pass to GA. An array will use the key/value to add _gaq.push (optional)
-* @param    boolean	Whether to check dev mode before adding it in (optional)
-* @return   string
-*/
 if (!function_exists('google_uanalytics'))
 {
+	/**
+	* Google Universal Analytics
+	*
+	* Inserts google universal analytics tracking code into view
+	* If a tracking code is passed in, then it will use that uacct info
+	* Otherwise, it will use the value defined in the google.php config file
+	* If both values do not exist, nothing will be inserted.
+	*
+	* @access    public
+	* @param    string	The google account number (optional)
+	* @param    mixed	An array or string of extra parameters to pass to GA. An array will use the key/value to add _gaq.push (optional)
+	* @param    boolean	Whether to check dev mode before adding it in (optional)
+	* @return   string
+	*/
 	function google_uanalytics($uacct = '', $other_params = array(), $check_devmode = TRUE) {
 
 		if ($check_devmode AND (function_exists('is_dev_mode') AND is_dev_mode()))
@@ -105,22 +105,22 @@ function google_uanalytics($uacct = '', $other_params = array(), $check_devmode
 
 // ------------------------------------------------------------------------
 
-/**
-* Google Analytics
-*
-* Inserts google analytics tracking code into view
-* If a tracking code is passed in, then it will use that uacct info
-* Otherwise, it will use the value defined in the google.php config file
-* If both values do not exist, nothing will be inserted.
-*
-* @access    public
-* @param    string	The google account number (optional)
-* @param    mixed	An array or string of extra parameters to pass to GA. An array will use the key/value to add _gaq.push (optional)
-* @param    boolean	Whether to check dev mode before adding it in (optional)
-* @return   string
-*/
 if (!function_exists('google_analytics'))
 {
+	/**
+	* Google Analytics
+	*
+	* Inserts google analytics tracking code into view
+	* If a tracking code is passed in, then it will use that uacct info
+	* Otherwise, it will use the value defined in the google.php config file
+	* If both values do not exist, nothing will be inserted.
+	*
+	* @access    public
+	* @param    string	The google account number (optional)
+	* @param    mixed	An array or string of extra parameters to pass to GA. An array will use the key/value to add _gaq.push (optional)
+	* @param    boolean	Whether to check dev mode before adding it in (optional)
+	* @return   string
+	*/
 	function google_analytics($uacct = '', $other_params = array(), $check_devmode = TRUE) {
 		/*
 		 (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
@@ -186,18 +186,18 @@ function google_analytics($uacct = '', $other_params = array(), $check_devmode =
 
 // ------------------------------------------------------------------------
 
-/**
-* Google map
-*
-* Returns an iframed Google map
-*
-* @access    public
-* @param    mixed	Address can be either an array with "address", "city", "state" or simply a string
-* @param    array	An array of additional map parameter that that includes, "height", "width", hl" (language), "z" (zoom), "t" (map type), "om", (overview map), "iwloc" (display info bubble), "ll" (lat,lng). Friendly names of "display_info" (iwloc), "map_type" (t), and "overview" (om) can be used. (optional)
-* @return   string
-*/
 if (!function_exists('google_map'))
 {
+	/**
+	* Google map
+	*
+	* Returns an iframed Google map
+	*
+	* @access    public
+	* @param    mixed	Address can be either an array with "address", "city", "state" or simply a string
+	* @param    array	An array of additional map parameter that that includes, "height", "width", hl" (language), "z" (zoom), "t" (map type), "om", (overview map), "iwloc" (display info bubble), "ll" (lat,lng). Friendly names of "display_info" (iwloc), "map_type" (t), and "overview" (om) can be used. (optional)
+	* @return   string
+	*/
 	function google_map($address, $params = array())
 	{
 		// get either the custom map url or the standard google url
@@ -219,18 +219,18 @@ function google_map($address, $params = array())
 
 // ------------------------------------------------------------------------
 
-/**
-* Google map URL
-*
-* Returns a google map URL (used by the google_map function too)
-*
-* @access    public
-* @param    mixed	Address can be either an array with "address", "city", "state" or simply a string. You can also pass lat and lng values as an array
-* @param    array	An array of additional map parameter that that includes, "hl" (language), "z" (zoom), "t" (map type), "om", (overview map), "iwloc" (display info bubble), "ll" (lat,lng). Friendly names of "display_info" (iwloc), "map_type" (t), and "overview" (om) can be used. (optional)
-* @return   string
-*/
 if (!function_exists('google_map_url'))
 {
+	/**
+	* Google map URL
+	*
+	* Returns a google map URL (used by the google_map function too)
+	*
+	* @access    public
+	* @param    mixed	Address can be either an array with "address", "city", "state" or simply a string. You can also pass lat and lng values as an array
+	* @param    array	An array of additional map parameter that that includes, "hl" (language), "z" (zoom), "t" (map type), "om", (overview map), "iwloc" (display info bubble), "ll" (lat,lng). Friendly names of "display_info" (iwloc), "map_type" (t), and "overview" (om) can be used. (optional)
+	* @return   string
+	*/
 	function google_map_url($address, $params = array())
 	{
 		// if a query string is passed, then we parse it into an array form
@@ -333,20 +333,20 @@ function google_map_url($address, $params = array())
 
 // ------------------------------------------------------------------------
 
-/**
-* Google geolocate
-*
-* Finds the latitude and longitude of a given address. 
-* Use sleep() or usleep() functions to meter multiple requests (10/s is limit I believe)
-* More on the return types here: https://developers.google.com/maps/documentation/geocoding/
-*
-* @access    public
-* @param    mixed	Address can be either an array with "address", "city", "state" or simply a string
-* @param    mixed	Return type can be 'all' (default), 'address_components', 'formatted_address', 'geometry', 'location', 'street_number', 'route', 'neighborhood', 'city',  'county', 'state', 'country', 'zip' (optional)
-* @return   mixed  usually an array (e.g. array('latitude' => xxxx, 'longitude' => xxxx))
-*/
 if (!function_exists('google_geolocate'))
 {
+	/**
+	* Google geolocate
+	*
+	* Finds the latitude and longitude of a given address.
+	* Use sleep() or usleep() functions to meter multiple requests (10/s is limit I believe)
+	* More on the return types here: https://developers.google.com/maps/documentation/geocoding/
+	*
+	* @access    public
+	* @param    mixed	Address can be either an array with "address", "city", "state" or simply a string
+	* @param    mixed	Return type can be 'all' (default), 'address_components', 'formatted_address', 'geometry', 'location', 'street_number', 'route', 'neighborhood', 'city',  'county', 'state', 'country', 'zip' (optional)
+	* @return   mixed  usually an array (e.g. array('latitude' => xxxx, 'longitude' => xxxx))
+	*/
 	function google_geolocate($data, $return = 'all', $long = TRUE)
 	{
 		$address = '';
diff --git a/fuel/modules/fuel/helpers/scraper_helper.php b/fuel/modules/fuel/helpers/scraper_helper.php
index f9265a632..5df1a568d 100644
--- a/fuel/modules/fuel/helpers/scraper_helper.php
+++ b/fuel/modules/fuel/helpers/scraper_helper.php
@@ -29,17 +29,17 @@
 
 // --------------------------------------------------------------------
 
-/**
- * Uses <a href="[user_guide_url]libraries/curl">CURL</a> to scrape the contents of a URL
- *
- * @access	public
- * @param	string	URL of page to scrape contents
- * @param	array	POST parameters to pass along in the request
- * @param	array	An additional set of CURL options
- * @return	string
- */	
 if (!function_exists('scrape_html'))
 {
+	/**
+	 * Uses <a href="[user_guide_url]libraries/curl">CURL</a> to scrape the contents of a URL
+	 *
+	 * @access	public
+	 * @param	string	URL of page to scrape contents
+	 * @param	array	POST parameters to pass along in the request
+	 * @param	array	An additional set of CURL options
+	 * @return	string
+	 */
 	function scrape_html($url, $post = array(), $opts = array())
 	{
 		$CI =& get_instance();
@@ -68,16 +68,16 @@ function scrape_html($url, $post = array(), $opts = array())
 
 // --------------------------------------------------------------------
 
-/**
- * Returns a DOM object of a page or a result object if an XPath query was passed
- *
- * @access	public
- * @param	string	URL of page to scrape contents
- * @param	string	an XPath query to pass
- * @return	object
- */	
 if (!function_exists('scrape_dom'))
 {
+	/**
+	 * Returns a DOM object of a page or a result object if an XPath query was passed
+	 *
+	 * @access	public
+	 * @param	string	URL of page to scrape contents
+	 * @param	string	an XPath query to pass
+	 * @return	object
+	 */
 	function scrape_dom($url, $xpath_query = NULL)
 	{
 		if (is_http_path($url))
@@ -115,15 +115,15 @@ function scrape_dom($url, $xpath_query = NULL)
 
 // --------------------------------------------------------------------
 
-/**
- * Uses <a href="[user_guide_url]libraries/curl">CURL</a> to determine if a page exists or not
- *
- * @access	public
- * @param	string	URL of page to check
- * @return	boolean
- */	
 if (!function_exists('is_valid_page'))
 {
+	/**
+	 * Uses <a href="[user_guide_url]libraries/curl">CURL</a> to determine if a page exists or not
+	 *
+	 * @access	public
+	 * @param	string	URL of page to check
+	 * @return	boolean
+	 */
 	function is_valid_page($url)
 	{
 		$CI =& get_instance();
diff --git a/fuel/modules/fuel/helpers/session_helper.php b/fuel/modules/fuel/helpers/session_helper.php
index 1bdc82669..78830c765 100644
--- a/fuel/modules/fuel/helpers/session_helper.php
+++ b/fuel/modules/fuel/helpers/session_helper.php
@@ -29,16 +29,15 @@
 
 // --------------------------------------------------------------------
 
-/**
- * Returns a session variable
- *
- * @access	public
- * @param	string	variable name
- * @return	boolean
- */	
-
 if (!function_exists('session_userdata'))
 {
+	/**
+	 * Returns a session variable
+	 *
+	 * @access	public
+	 * @param	string	variable name
+	 * @return	boolean
+	 */
 	function session_userdata($key)
 	{
 		$CI =& get_instance();
@@ -52,15 +51,15 @@ function session_userdata($key)
 
 // --------------------------------------------------------------------
 
-/**
- * Sets a session variable
- *
- * @access	public
- * @param	string	variable name
- * @return	boolean
- */	
 if (!function_exists('session_set_userdata'))
 {
+	/**
+	 * Sets a session variable
+	 *
+	 * @access	public
+	 * @param	string	variable name
+	 * @return	boolean
+	 */
 	function session_set_userdata($key, $value)
 	{
 		$CI =& get_instance();
@@ -73,15 +72,15 @@ function session_set_userdata($key, $value)
 }
 // --------------------------------------------------------------------
 
-/**
- * Returns a session flash variable
- *
- * @access	public
- * @param	string	variable name
- * @return	boolean
- */	
 if (!function_exists('session_flashdata'))
 {
+	/**
+	 * Returns a session flash variable
+	 *
+	 * @access	public
+	 * @param	string	variable name
+	 * @return	boolean
+	 */
 	function session_flashdata($key)
 	{
 		$CI =& get_instance();
@@ -96,15 +95,15 @@ function session_flashdata($key)
 
 // --------------------------------------------------------------------
 
-/**
- * Sets a session flash variable
- *
- * @access	public
- * @param	string	variable name
- * @return	boolean
- */	
 if (!function_exists('session_set_flashdata'))
 {
+	/**
+	 * Sets a session flash variable
+	 *
+	 * @access	public
+	 * @param	string	variable name
+	 * @return	boolean
+	 */
 	function session_set_flashdata($key, $value)
 	{
 		$CI =& get_instance();
diff --git a/fuel/modules/fuel/helpers/simplepie_helper.php b/fuel/modules/fuel/helpers/simplepie_helper.php
index 7e3c7e8e9..96600dd38 100644
--- a/fuel/modules/fuel/helpers/simplepie_helper.php
+++ b/fuel/modules/fuel/helpers/simplepie_helper.php
@@ -29,17 +29,17 @@
 
 // --------------------------------------------------------------------
 
-/**
- * Uses <a href="[user_guide_url]libraries/simplepie">SimplePie</a> class to retrieve an RSS Feed
- *
- * @access	public
- * @param	string	Feed URL
- * @param	string	The number of results to return
- * @param	string	Additional parameters which include, cache_duration, enable_order_by_date, enable_cache and cache_location
- * @return	object
- */
 if (!function_exists('simplepie'))
 {
+	/**
+	 * Uses <a href="[user_guide_url]libraries/simplepie">SimplePie</a> class to retrieve an RSS Feed
+	 *
+	 * @access	public
+	 * @param	string	Feed URL
+	 * @param	string	The number of results to return
+	 * @param	string	Additional parameters which include, cache_duration, enable_order_by_date, enable_cache and cache_location
+	 * @return	object
+	 */
 	function simplepie($feed, $limit = 5, $params = array())
 	{
 		$CI =& get_instance();
diff --git a/fuel/modules/fuel/helpers/social_helper.php b/fuel/modules/fuel/helpers/social_helper.php
index d0c43d360..8c29ba369 100644
--- a/fuel/modules/fuel/helpers/social_helper.php
+++ b/fuel/modules/fuel/helpers/social_helper.php
@@ -29,16 +29,16 @@
 
 // --------------------------------------------------------------------
 
-/**
- * Uses <a href="../libraries/social">Social</a> class's share method to return social links
- *
- * @access	public
- * @param	string	The type of social URL. A list of supported URLs can be found in the fuel/application/config/social.php file under the $config['share_url']
- * @param	mixed	Can be an object or an array of values
- * @return	string
- */
 if (!function_exists('share'))
 {
+	/**
+	 * Uses <a href="../libraries/social">Social</a> class's share method to return social links
+	 *
+	 * @access	public
+	 * @param	string	The type of social URL. A list of supported URLs can be found in the fuel/application/config/social.php file under the $config['share_url']
+	 * @param	mixed	Can be an object or an array of values
+	 * @return	string
+	 */
 	function share($type, $values = NULL)
 	{
 		$CI =& get_instance();
@@ -50,15 +50,15 @@ function share($type, $values = NULL)
 	}
 }
 
-/**
- * Uses <a href="../libraries/social">Social</a> class's og method to create open graph links
- *
- * @access	public
- * @param	array	An array of values for the open graph which can include array keys of 'title', 'url', 'description', 'image', 'site_name', 'type'
- * @return	string
- */
 if (!function_exists('og'))
 {
+	/**
+	 * Uses <a href="../libraries/social">Social</a> class's og method to create open graph links
+	 *
+	 * @access	public
+	 * @param	array	An array of values for the open graph which can include array keys of 'title', 'url', 'description', 'image', 'site_name', 'type'
+	 * @return	string
+	 */
 	function og($values)
 	{
 		$CI =& get_instance();
@@ -70,17 +70,17 @@ function og($values)
 	}
 }
 
-/**
- * Creates the popup window javascript for the share links and writes the javascript only once to the page.
- *
- * @access	public
- * @param	int		The width of the popup javascript window (optional)
- * @param	int		The height of the popup javascript window (optional)
- * @param	string	The selector used for the popup window. Default is .popup (optional)
- * @return	string
- */
 if (!function_exists('social_popup_js'))
 {
+	/**
+	 * Creates the popup window javascript for the share links and writes the javascript only once to the page.
+	 *
+	 * @access	public
+	 * @param	int		The width of the popup javascript window (optional)
+	 * @param	int		The height of the popup javascript window (optional)
+	 * @param	string	The selector used for the popup window. Default is .popup (optional)
+	 * @return	string
+	 */
 	function social_popup_js($width = 640, $height = 500, $selector = 'popup')
 	{
 		// only write the javascript one time so we create a static variable
diff --git a/fuel/modules/fuel/helpers/utility_helper.php b/fuel/modules/fuel/helpers/utility_helper.php
index a299f3992..2ed4bb205 100644
--- a/fuel/modules/fuel/helpers/utility_helper.php
+++ b/fuel/modules/fuel/helpers/utility_helper.php
@@ -48,15 +48,15 @@ function CI() {
 
 // --------------------------------------------------------------------
 
-/**
- * Capture content via an output buffer
- *
- * @param	boolean	turn on output buffering
- * @param	string	if set to 'all', will clear end the buffer and clean it
- * @return 	string	return buffered content
- */
 if (!function_exists('capture'))
 {
+	/**
+	 * Capture content via an output buffer
+	 *
+	 * @param	boolean	turn on output buffering
+	 * @param	string	if set to 'all', will clear end the buffer and clean it
+	 * @return 	string	return buffered content
+	 */
 	function capture($on = TRUE, $clean = 'all')
 	{
 		$str = '';
@@ -85,14 +85,14 @@ function capture($on = TRUE, $clean = 'all')
 
 // --------------------------------------------------------------------
 
-/**
- * Format true value
- *
- * @param	mixed	possible true value
- * @return 	string	formatted true value
- */
 if (!function_exists('is_true_val'))
 {
+	/**
+	 * Format true value
+	 *
+	 * @param	mixed	possible true value
+	 * @return 	string	formatted true value
+	 */
 	function is_true_val($val)
 	{
 		$val = strtolower($val);
@@ -102,14 +102,14 @@ function is_true_val($val)
 
 // --------------------------------------------------------------------
 
-/**
- * Boolean check to determine string content is serialized
- *
- * @param	mixed	possible serialized string
- * @return 	boolean
- */
 if (!function_exists('is_serialized_str'))
 {
+	/**
+	 * Boolean check to determine string content is serialized
+	 *
+	 * @param	mixed	possible serialized string
+	 * @return 	boolean
+	 */
 	function is_serialized_str($data)
 	{
 		if ( !is_string($data))
@@ -139,14 +139,14 @@ function is_serialized_str($data)
 
 // --------------------------------------------------------------------
 
-/**
- * Boolean check to determine string content is a JSON object string
- *
- * @param	mixed	possible serialized string
- * @return 	boolean
- */
 if (!function_exists('is_json_str'))
 {
+	/**
+	 * Boolean check to determine string content is a JSON object string
+	 *
+	 * @param	mixed	possible serialized string
+	 * @return 	boolean
+	 */
 	function is_json_str($data)
 	{
 		if (is_string($data))
@@ -160,15 +160,15 @@ function is_json_str($data)
 
 // --------------------------------------------------------------------
 
-/**
- * Print object in human-readible format
- * 
- * @param	mixed	The variable to dump
- * @param	boolean	Return string
- * @return 	string
- */
 if (!function_exists('print_obj'))
 {
+	/**
+	 * Print object in human-readible format
+	 *
+	 * @param	mixed	The variable to dump
+	 * @param	boolean	Return string
+	 * @return 	string
+	 */
 	function print_obj($obj, $return = FALSE)
 	{
 		$str = "<pre>";
@@ -207,14 +207,14 @@ function print_obj($obj, $return = FALSE)
 
 // --------------------------------------------------------------------
 
-/**
- * Logs an error message to logs file
- *
- * @param	string	Error message
- * @return 	void
- */
 if (!function_exists('log_error'))
 {
+	/**
+	 * Logs an error message to logs file
+	 *
+	 * @param	string	Error message
+	 * @return 	void
+	 */
 	function log_error($error) 
 	{
 		log_message('error', $error);
@@ -223,13 +223,13 @@ function log_error($error)
 
 // --------------------------------------------------------------------
 
-/**
- * Returns whether the current environment is set for development
- *
- * @return 	boolean
- */
 if (!function_exists('is_dev_mode'))
 {
+	/**
+	 * Returns whether the current environment is set for development
+	 *
+	 * @return 	boolean
+	 */
 	function is_dev_mode()
 	{
 		return (ENVIRONMENT != 'production');
@@ -238,13 +238,13 @@ function is_dev_mode()
 
 // --------------------------------------------------------------------
 
-/**
- * Returns whether the current environment is equal to the passed environment
- *
- * @return 	boolean
- */
 if (!function_exists('is_environment'))
 {
+	/**
+	 * Returns whether the current environment is equal to the passed environment
+	 *
+	 * @return 	boolean
+	 */
 	function is_environment($environment)
 	{
 		return (strtolower(ENVIRONMENT) == strtolower($environment));
diff --git a/fuel/modules/fuel/helpers/validator_helper.php b/fuel/modules/fuel/helpers/validator_helper.php
index 896417ba4..9a9741a6f 100644
--- a/fuel/modules/fuel/helpers/validator_helper.php
+++ b/fuel/modules/fuel/helpers/validator_helper.php
@@ -31,15 +31,15 @@
 
 // --------------------------------------------------------------------
 
-/**
- * Check for variable solvency
- *
- * @access	public
- * @param	mixed	variable of any kind
- * @return	boolean
- */
 if (!function_exists('required'))
 {
+	/**
+	 * Check for variable solvency
+	 *
+	 * @access	public
+	 * @param	mixed	variable of any kind
+	 * @return	boolean
+	 */
 	function required($var)
 	{
 		if (is_string($var))
@@ -65,16 +65,16 @@ function required($var)
 
 // --------------------------------------------------------------------
 
-/**
- * Check for matches within a string
- *
- * @access	public
- * @param	string	string containing content to be matched against
- * @param	string	regular expression (delimiters excluded)
- * @return	boolean
- */
 if (!function_exists('regex'))
 {
+	/**
+	 * Check for matches within a string
+	 *
+	 * @access	public
+	 * @param	string	string containing content to be matched against
+	 * @param	string	regular expression (delimiters excluded)
+	 * @return	boolean
+	 */
 	function regex($var = null, $regex)
 	{
 		return preg_match('#'.$regex.'#', $var);
@@ -83,15 +83,15 @@ function regex($var = null, $regex)
 
 // --------------------------------------------------------------------
 
-/**
- * Ensure at least one array variable contains content
- *
- * @access	public
- * @param	array	array containing values of indiscriminate size
- * @return	boolean
- */
 if (!function_exists('has_one_of_these'))
 {
+	/**
+	 * Ensure at least one array variable contains content
+	 *
+	 * @access	public
+	 * @param	array	array containing values of indiscriminate size
+	 * @return	boolean
+	 */
 	function has_one_of_these($args = null)
 	{
 		if(!is_array($args))
@@ -111,16 +111,16 @@ function has_one_of_these($args = null)
 
 // --------------------------------------------------------------------
 
-/**
- * Validate email address against standard email address form
- *
- * @access	public
- * @param	string	string containing email address
- * @return	boolean
- */
 // to prevent issue with email helpers function
 if ( ! function_exists('valid_email'))
 {
+	/**
+	 * Validate email address against standard email address form
+	 *
+	 * @access	public
+	 * @param	string	string containing email address
+	 * @return	boolean
+	 */
 	function valid_email($email)
 	{
 		if (function_exists('filter_var'))
@@ -135,16 +135,16 @@ function valid_email($email)
 } 
 // --------------------------------------------------------------------
 
-/**
- * Ensure a numeric value is greater than given size
- *
- * @access	public
- * @param	int		integer of any length
- * @param 	int		integer of any length to test against 
- * @return	boolean
- */
 if (!function_exists('min_num'))
 {
+	/**
+	 * Ensure a numeric value is greater than given size
+	 *
+	 * @access	public
+	 * @param	int		integer of any length
+	 * @param 	int		integer of any length to test against
+	 * @return	boolean
+	 */
 	function min_num($var, $limit = 1)
 	{
 		if($var < $limit)
@@ -157,16 +157,16 @@ function min_num($var, $limit = 1)
 
 // --------------------------------------------------------------------
 
-/**
- * Ensure a numeric value is less than given size
- *
- * @access	public
- * @param	int		integer of any length
- * @param 	int		integer of any length to test against 
- * @return	boolean
- */
 if (!function_exists('max_num'))
 {
+	/**
+	 * Ensure a numeric value is less than given size
+	 *
+	 * @access	public
+	 * @param	int		integer of any length
+	 * @param 	int		integer of any length to test against
+	 * @return	boolean
+	 */
 	function max_num($var, $limit = 1)
 	{
 		if($var > $limit)
@@ -179,17 +179,17 @@ function max_num($var, $limit = 1)
 
 // --------------------------------------------------------------------
 
-/**
- * Ensure a numeric value exists between a given size
- *
- * @access	public
- * @param	int		integer of any length
- * @param 	int		integer of any length to test low
- * @param 	int		integer of any length to test high 
- * @return	boolean
- */
 if (!function_exists('is_between'))
 {
+	/**
+	 * Ensure a numeric value exists between a given size
+	 *
+	 * @access	public
+	 * @param	int		integer of any length
+	 * @param 	int		integer of any length to test low
+	 * @param 	int		integer of any length to test high
+	 * @return	boolean
+	 */
 	function is_between($var, $lo, $hi)
 	{
 		if($var <= $hi AND $var >= $lo)
@@ -202,17 +202,17 @@ function is_between($var, $lo, $hi)
 
 // --------------------------------------------------------------------
 
-/**
- * Ensure a numeric value exists outside a given range
- *
- * @access	public
- * @param	int		integer of any length
- * @param 	int		integer of any length to test low
- * @param 	int		integer of any length to test high 
- * @return	boolean
- */
 if (!function_exists('is_outside'))
 {
+	/**
+	 * Ensure a numeric value exists outside a given range
+	 *
+	 * @access	public
+	 * @param	int		integer of any length
+	 * @param 	int		integer of any length to test low
+	 * @param 	int		integer of any length to test high
+	 * @return	boolean
+	 */
 	function is_outside($var, $lo, $hi)
 	{
 		if($var >= $hi AND $var <= $lo)
@@ -225,16 +225,16 @@ function is_outside($var, $lo, $hi)
 
 // --------------------------------------------------------------------
 
-/**
- * Ensure a string's size exists within a certain limited range
- *
- * @access	public
- * @param	string	string of any length
- * @param 	int		integer to test string length against
- * @return	boolean
- */
 if (!function_exists('length_max'))
 {
+	/**
+	 * Ensure a string's size exists within a certain limited range
+	 *
+	 * @access	public
+	 * @param	string	string of any length
+	 * @param 	int		integer to test string length against
+	 * @return	boolean
+	 */
 	function length_max($str, $limit = 1000)
 	{
 		if (strlen(strval($str)) > $limit)
@@ -250,16 +250,16 @@ function length_max($str, $limit = 1000)
 
 // --------------------------------------------------------------------
 
-/**
- * Ensure a string exists within a given limit
- *
- * @access	public
- * @param	string	string of any length
- * @param 	int		integer to test string length against
- * @return	boolean
- */
 if (!function_exists('length_min'))
 {
+	/**
+	 * Ensure a string exists within a given limit
+	 *
+	 * @access	public
+	 * @param	string	string of any length
+	 * @param 	int		integer to test string length against
+	 * @return	boolean
+	 */
 	function length_min($str, $limit = 1)
 	{
 		if (strlen(strval($str)) < $limit)
@@ -274,15 +274,15 @@ function length_min($str, $limit = 1)
 }
 // --------------------------------------------------------------------
 
-/**
- * Ensure a valid phone number
- *
- * @access	public
- * @param	string	string of any length
- * @return	boolean
- */
 if (!function_exists('valid_phone'))
 {
+	/**
+	 * Ensure a valid phone number
+	 *
+	 * @access	public
+	 * @param	string	string of any length
+	 * @return	boolean
+	 */
 	function valid_phone($str)
 	{
 		$num = $str;
@@ -304,16 +304,16 @@ function valid_phone($str)
 
 // --------------------------------------------------------------------
 
-/**
- * Ensure to variables are equal
- *
- * @access	public
- * @param	mixed	mixed variable to test equality
- * @param	mixed	mixed variable to test equality
- * @return	boolean
- */
 if (!function_exists('is_equal_to'))
 {
+	/**
+	 * Ensure to variables are equal
+	 *
+	 * @access	public
+	 * @param	mixed	mixed variable to test equality
+	 * @param	mixed	mixed variable to test equality
+	 * @return	boolean
+	 */
 	function is_equal_to($val, $val2)
 	{
 		if($val == $val2) 
@@ -327,16 +327,16 @@ function is_equal_to($val, $val2)
 
 // --------------------------------------------------------------------
 
-/**
- * Ensure to variables are not equal
- *
- * @access	public
- * @param	mixed	mixed variable to test equality
- * @param	mixed	mixed variable to test equality
- * @return	boolean
- */
 if (!function_exists('is_not_equal_to'))
 {
+	/**
+	 * Ensure to variables are not equal
+	 *
+	 * @access	public
+	 * @param	mixed	mixed variable to test equality
+	 * @param	mixed	mixed variable to test equality
+	 * @return	boolean
+	 */
 	function is_not_equal_to($val, $val2)
 	{
 		if($val != $val2) 
@@ -350,16 +350,16 @@ function is_not_equal_to($val, $val2)
 
 // --------------------------------------------------------------------
 
-/**
- * Test array to see if value exists
- *
- * @access	public
- * @param	mixed	mixed variable
- * @param	array	array to test if value exists
- * @return	boolean
- */
 if (!function_exists('is_one_of_these'))
 {
+	/**
+	 * Test array to see if value exists
+	 *
+	 * @access	public
+	 * @param	mixed	mixed variable
+	 * @param	array	array to test if value exists
+	 * @return	boolean
+	 */
 	function is_one_of_these($val, $search_in = array())
 	{
 		if (in_array($val, $search_in))
@@ -372,16 +372,16 @@ function is_one_of_these($val, $search_in = array())
 
 // --------------------------------------------------------------------
 
-/**
- * Test array to see if value does not exist
- *
- * @access	public
- * @param	mixed	mixed variable
- * @param	array	array to test if value exists
- * @return	boolean
- */
 if (!function_exists('is_not_one_of_these'))
 {
+	/**
+	 * Test array to see if value does not exist
+	 *
+	 * @access	public
+	 * @param	mixed	mixed variable
+	 * @param	array	array to test if value exists
+	 * @return	boolean
+	 */
 	function is_not_one_of_these($val, $searchIn = array())
 	{
 		if(!in_array($val, $searchIn))
@@ -395,16 +395,16 @@ function is_not_one_of_these($val, $searchIn = array())
 
 // --------------------------------------------------------------------
 
-/**
- * Test array to see if a file is of a given type
- *
- * @access	public
- * @param	string	filename
- * @param	string	mime value of file to test
- * @return	boolean
- */
 if (!function_exists('is_of_file_type'))
 {
+	/**
+	 * Test array to see if a file is of a given type
+	 *
+	 * @access	public
+	 * @param	string	filename
+	 * @param	string	mime value of file to test
+	 * @return	boolean
+	 */
 	function is_of_file_type($fileName, $fileType)
 	{
 		if($fileType == 'zip') 
@@ -425,15 +425,15 @@ function is_of_file_type($fileName, $fileType)
 
 // --------------------------------------------------------------------
 
-/**
- * Test array to see if a file is of a given type
- *
- * @access	public
- * @param	string	filename
- * @return	boolean
- */
 if (!function_exists('valid_file_upload'))
 {
+	/**
+	 * Test array to see if a file is of a given type
+	 *
+	 * @access	public
+	 * @param	string	filename
+	 * @return	boolean
+	 */
 	function valid_file_upload($file_name)
 	{
 		if(empty($_FILES[$file_name]) OR $_FILES[$file_name]['error'] > 0)
@@ -448,16 +448,16 @@ function valid_file_upload($file_name)
 
 // --------------------------------------------------------------------
 
-/**
- * Test string for valid characters
- *
- * @access	public
- * @param	mixed	string value
- * @param	array	list of allowed characters 
- * @return	boolean
- */
 if (!function_exists('is_safe_character'))
 {
+	/**
+	 * Test string for valid characters
+	 *
+	 * @access	public
+	 * @param	mixed	string value
+	 * @param	array	list of allowed characters
+	 * @return	boolean
+	 */
 	function is_safe_character($val, $allowed = array('_', '-'))
 	{
 		$newVal = str_replace($allowed, '', $val);
@@ -472,17 +472,17 @@ function is_safe_character($val, $allowed = array('_', '-'))
 
 // --------------------------------------------------------------------
 
-/**
- * Test date and time for proper format
- *
- * @access	public
- * @param	string	date as string value
- * @param	string	format of date to test against
- * @param	string	delimiter of date value given for testing 
- * @return	boolean
- */
 if (!function_exists('valid_date_time'))
 {
+	/**
+	 * Test date and time for proper format
+	 *
+	 * @access	public
+	 * @param	string	date as string value
+	 * @param	string	format of date to test against
+	 * @param	string	delimiter of date value given for testing
+	 * @return	boolean
+	 */
 	function valid_date_time($date, $format = "ymd", $delimiter = "-") 
 	{
 		return (valid_date($date, $format, $delimiter) && valid_time($date));
@@ -491,17 +491,17 @@ function valid_date_time($date, $format = "ymd", $delimiter = "-")
 
 // --------------------------------------------------------------------
 
-/**
- * Test date for proper format
- *
- * @access	public
- * @param	string	date as string value
- * @param	string	format of date to test against
- * @param	string	delimiter of date value given for testing 
- * @return	boolean
- */
 if (!function_exists('valid_date'))
 {
+	/**
+	 * Test date for proper format
+	 *
+	 * @access	public
+	 * @param	string	date as string value
+	 * @param	string	format of date to test against
+	 * @param	string	delimiter of date value given for testing
+	 * @return	boolean
+	 */
 	function valid_date($date, $format = "ymd", $delimiter = "-") 
 	{
 		list($d1, $d2, $d3) = sscanf($date, "%d".$delimiter."%d".$delimiter."%d");
@@ -515,15 +515,15 @@ function valid_date($date, $format = "ymd", $delimiter = "-")
 
 // --------------------------------------------------------------------
 
-/**
- * Test time for proper format
- *
- * @access	public
- * @param	string	date as string value
- * @return	boolean
- */
 if (!function_exists('valid_time'))
 {
+	/**
+	 * Test time for proper format
+	 *
+	 * @access	public
+	 * @param	string	date as string value
+	 * @return	boolean
+	 */
 	function valid_time($date) 
 	{
 		$date = trim($date);
@@ -578,17 +578,17 @@ function valid_time($date)
 
 // --------------------------------------------------------------------
 
-/**
- * Validate date passed
- *
- * @access	public
- * @param	string	month value or current date value
- * @param	string	day value
- * @param	string	year value  
- * @return	boolean
- */
 if (!function_exists('valid_mdy'))
 {
+	/**
+	 * Validate date passed
+	 *
+	 * @access	public
+	 * @param	string	month value or current date value
+	 * @param	string	day value
+	 * @param	string	year value
+	 * @return	boolean
+	 */
 	function valid_mdy($m, $d = null, $y = null)
 	{
 		if(empty($d) && empty($y))
@@ -610,16 +610,16 @@ function valid_mdy($m, $d = null, $y = null)
 
 // --------------------------------------------------------------------
 
-/**
- * Check to dates to ensure one is after the other
- *
- * @access	public
- * @param	string	date value as string
- * @param	string	date value as string(should be later date)
- * @return	boolean
- */
 if (!function_exists('is_after_date'))
 {
+	/**
+	 * Check to dates to ensure one is after the other
+	 *
+	 * @access	public
+	 * @param	string	date value as string
+	 * @param	string	date value as string(should be later date)
+	 * @return	boolean
+	 */
 	function is_after_date($date1, $date2)
 	{
 		$date1 = strtotime($date1);
@@ -634,16 +634,16 @@ function is_after_date($date1, $date2)
 
 // --------------------------------------------------------------------
 
-/**
- * Check to dates to ensure one is before the other
- *
- * @access	public
- * @param	string	date value as string(should be later date)
- * @param	string	date value as string
- * @return	boolean
- */
 if (!function_exists('is_before_date'))
 {
+	/**
+	 * Check to dates to ensure one is before the other
+	 *
+	 * @access	public
+	 * @param	string	date value as string(should be later date)
+	 * @param	string	date value as string
+	 * @return	boolean
+	 */
 	function is_before_date($date1, $date2)
 	{
 		$date1 = strtotime($date1);
@@ -658,17 +658,17 @@ function is_before_date($date1, $date2)
 
 // --------------------------------------------------------------------
 
-/**
- * Check to validate date exists between two others
- *
- * @access	public
- * @param	string	date value as string
- * @param	string	date value as string(low date)
- * @param	string	date value as string(high date)
- * @return	boolean
- */
 if (!function_exists('is_between_dates'))
 {
+	/**
+	 * Check to validate date exists between two others
+	 *
+	 * @access	public
+	 * @param	string	date value as string
+	 * @param	string	date value as string(low date)
+	 * @param	string	date value as string(high date)
+	 * @return	boolean
+	 */
 	function is_between_dates($val, $date1, $date2)
 	{
 		$val = strtotime($val);
@@ -684,15 +684,15 @@ function is_between_dates($val, $date1, $date2)
 
 // --------------------------------------------------------------------
 
-/**
- * Check to see if date is a future date
- *
- * @access	public
- * @param	string	date value as string
- * @return	boolean
- */
 if (!function_exists('is_future_date'))
 {
+	/**
+	 * Check to see if date is a future date
+	 *
+	 * @access	public
+	 * @param	string	date value as string
+	 * @return	boolean
+	 */
 	function is_future_date($val)
 	{
 		return is_after_date($val, date("Y-m-d 00:00:00"));
@@ -701,15 +701,15 @@ function is_future_date($val)
 
 // --------------------------------------------------------------------
 
-/**
- * Check to see if date is past date
- *
- * @access	public
- * @param	string	date value as string
- * @return	boolean
- */
 if (!function_exists('is_past_date'))
 {
+	/**
+	 * Check to see if date is past date
+	 *
+	 * @access	public
+	 * @param	string	date value as string
+	 * @return	boolean
+	 */
 	function is_past_date($val)
 	{
 		return is_before_date($val, date("Y-m-d 23:59:59"));
@@ -718,15 +718,15 @@ function is_past_date($val)
 
 // --------------------------------------------------------------------
 
-/**
- * Display user-defined errors via javascript
- *
- * @access	public
- * @param	mixed	collection of errors created by user
- * @return	string
- */
 if (!function_exists('display_errors_js'))
 {
+	/**
+	 * Display user-defined errors via javascript
+	 *
+	 * @access	public
+	 * @param	mixed	collection of errors created by user
+	 * @return	string
+	 */
 	function display_errors_js($ERRORS = NULL) 
 	{
 		if (empty($GLOBALS['__ERRORS_JS__']))
@@ -791,16 +791,16 @@ function displayErrors".$GLOBALS['__ERRORS_JS__']."() {
 
 // --------------------------------------------------------------------
 
-/**
- * Display user-defined errors via javascript and html
- *
- * @access	public
- * @param	string  css class to define error styling
- * @param	mixed	collection of errors created by user
- * @return	string
- */
 if (!function_exists('display_errors'))
 {
+	/**
+	 * Display user-defined errors via javascript and html
+	 *
+	 * @access	public
+	 * @param	string  css class to define error styling
+	 * @param	mixed	collection of errors created by user
+	 * @return	string
+	 */
 	function display_errors($ERRORS = NULL, $class = 'error')
 	{
 		$CI =& get_instance();
@@ -853,14 +853,14 @@ function display_errors($ERRORS = NULL, $class = 'error')
 
 // --------------------------------------------------------------------
 
-/**
- * Check if any user defined errors have been defined
- *
- * @access	public
- * @return	boolean
- */
 if (!function_exists('has_errors'))
 {
+	/**
+	 * Check if any user defined errors have been defined
+	 *
+	 * @access	public
+	 * @return	boolean
+	 */
 	function has_errors()
 	{
 		return (defined('GLOBAL_ERRORS') && !empty($GLOBALS[GLOBAL_ERRORS]));
@@ -869,16 +869,16 @@ function has_errors()
 
 // --------------------------------------------------------------------
 
-/**
- * Add a user-defined error message
- *
- * @access	public
- * @param	string error message
- * @param	string key value for error message array
- * @return	boolean
- */
 if (!function_exists('add_error'))
 {
+	/**
+	 * Add a user-defined error message
+	 *
+	 * @access	public
+	 * @param	string error message
+	 * @param	string key value for error message array
+	 * @return	boolean
+	 */
 	function add_error($msg, $key = NULL)
 	{
 		if(defined('GLOBAL_ERRORS')) 
@@ -894,16 +894,16 @@ function add_error($msg, $key = NULL)
 
 // --------------------------------------------------------------------
 
-/**
- * Add a user-defined error message
- *
- * @access	public
- * @param	string error message
- * @param	string key value for error message array
- * @return	boolean
- */
 if (!function_exists('add_errors'))
 {
+	/**
+	 * Add a user-defined error message
+	 *
+	 * @access	public
+	 * @param	string error message
+	 * @param	string key value for error message array
+	 * @return	boolean
+	 */
 	function add_errors($errors)
 	{
 		$errors = (array) $errors;
@@ -915,15 +915,15 @@ function add_errors($errors)
 }
 // --------------------------------------------------------------------
 
-/**
- * Get a user-defined error message
- *
- * @access	public
- * @param	string key value for error message array
- * @return	string
- */
 if (!function_exists('get_error'))
 {
+	/**
+	 * Get a user-defined error message
+	 *
+	 * @access	public
+	 * @param	string key value for error message array
+	 * @return	string
+	 */
 	function get_error($key = null)
 	{
 		if (defined('GLOBAL_ERRORS')) {
@@ -941,14 +941,14 @@ function get_error($key = null)
 
 // --------------------------------------------------------------------
 
-/**
- * Get all global error messages
- *
- * @access	public
- * @return	array
- */
 if (!function_exists('get_errors'))
 {
+	/**
+	 * Get all global error messages
+	 *
+	 * @access	public
+	 * @return	array
+	 */
 	function get_errors()
 	{
 		if (defined('GLOBAL_ERRORS') AND !empty($GLOBALS[GLOBAL_ERRORS]))

From 1c0854322bc7651175e4fba5f41101e7be183d8e Mon Sep 17 00:00:00 2001
From: Martynas Sateika <martynas.sateika@gmail.com>
Date: Sun, 18 Mar 2018 02:40:49 +0000
Subject: [PATCH 010/129] Fix spacing issues, missing function separator
 comments

---
 fuel/modules/fuel/helpers/MY_array_helper.php     | 4 ++++
 fuel/modules/fuel/helpers/MY_directory_helper.php | 1 -
 fuel/modules/fuel/helpers/MY_file_helper.php      | 1 -
 fuel/modules/fuel/helpers/MY_html_helper.php      | 1 -
 fuel/modules/fuel/helpers/MY_language_helper.php  | 1 -
 fuel/modules/fuel/helpers/asset_helper.php        | 1 -
 fuel/modules/fuel/helpers/format_helper.php       | 2 --
 fuel/modules/fuel/helpers/scraper_helper.php      | 2 +-
 fuel/modules/fuel/helpers/session_helper.php      | 3 ++-
 fuel/modules/fuel/helpers/simplepie_helper.php    | 1 -
 fuel/modules/fuel/helpers/social_helper.php       | 5 ++++-
 fuel/modules/fuel/helpers/validator_helper.php    | 5 ++++-
 12 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/fuel/modules/fuel/helpers/MY_array_helper.php b/fuel/modules/fuel/helpers/MY_array_helper.php
index 3e38ee15e..3278faf1c 100644
--- a/fuel/modules/fuel/helpers/MY_array_helper.php
+++ b/fuel/modules/fuel/helpers/MY_array_helper.php
@@ -216,6 +216,8 @@ function parse_string_to_array($str)
 	}
 }
 
+// --------------------------------------------------------------------
+
 if ( ! function_exists('array_group'))
 {
 	/**
@@ -237,6 +239,8 @@ function array_group($array, $groups)
 	}
 }
 
+// --------------------------------------------------------------------
+
 if ( ! function_exists('csv_to_array'))
 {
 	/**
diff --git a/fuel/modules/fuel/helpers/MY_directory_helper.php b/fuel/modules/fuel/helpers/MY_directory_helper.php
index 52b326d61..c2735fa69 100644
--- a/fuel/modules/fuel/helpers/MY_directory_helper.php
+++ b/fuel/modules/fuel/helpers/MY_directory_helper.php
@@ -29,7 +29,6 @@
  * @link		http://docs.getfuelcms.com/helpers/my_directory_helper
  */
 
-
 // --------------------------------------------------------------------
 
 if (!function_exists('copyr'))
diff --git a/fuel/modules/fuel/helpers/MY_file_helper.php b/fuel/modules/fuel/helpers/MY_file_helper.php
index 5d28368f4..e25da6cfc 100644
--- a/fuel/modules/fuel/helpers/MY_file_helper.php
+++ b/fuel/modules/fuel/helpers/MY_file_helper.php
@@ -29,7 +29,6 @@
  * @link		http://docs.getfuelcms.com/helpers/my_file_helper
  */
 
-
 // --------------------------------------------------------------------
 
 if (!function_exists('get_dir_file_info'))
diff --git a/fuel/modules/fuel/helpers/MY_html_helper.php b/fuel/modules/fuel/helpers/MY_html_helper.php
index 21fc725e2..1b913dea3 100644
--- a/fuel/modules/fuel/helpers/MY_html_helper.php
+++ b/fuel/modules/fuel/helpers/MY_html_helper.php
@@ -29,7 +29,6 @@
  * @link		http://docs.getfuelcms.com/helpers/my_html_helper
  */
 
-
 // --------------------------------------------------------------------
 
 if (!function_exists('tag'))
diff --git a/fuel/modules/fuel/helpers/MY_language_helper.php b/fuel/modules/fuel/helpers/MY_language_helper.php
index 38e24c730..d9e8deeb0 100644
--- a/fuel/modules/fuel/helpers/MY_language_helper.php
+++ b/fuel/modules/fuel/helpers/MY_language_helper.php
@@ -29,7 +29,6 @@
  * @link		http://docs.getfuelcms.com/helpers/my_language_helper
  */
 
-
 // --------------------------------------------------------------------
 
 if (!function_exists('lang'))
diff --git a/fuel/modules/fuel/helpers/asset_helper.php b/fuel/modules/fuel/helpers/asset_helper.php
index f7f67d210..77d30e9cc 100644
--- a/fuel/modules/fuel/helpers/asset_helper.php
+++ b/fuel/modules/fuel/helpers/asset_helper.php
@@ -30,7 +30,6 @@
  * @link		http://docs.getfuelcms.com/helpers/asset_helper
  */
 
-
 // --------------------------------------------------------------------
 
 if (!function_exists('img_path'))
diff --git a/fuel/modules/fuel/helpers/format_helper.php b/fuel/modules/fuel/helpers/format_helper.php
index 414491cc6..ab317db22 100644
--- a/fuel/modules/fuel/helpers/format_helper.php
+++ b/fuel/modules/fuel/helpers/format_helper.php
@@ -26,8 +26,6 @@
  * @link		http://docs.getfuelcms.com/helpers/format_helper
  */
 
-
-
 // ------------------------------------------------------------------------
 
 if (!function_exists('currency'))
diff --git a/fuel/modules/fuel/helpers/scraper_helper.php b/fuel/modules/fuel/helpers/scraper_helper.php
index 5df1a568d..5427338d5 100644
--- a/fuel/modules/fuel/helpers/scraper_helper.php
+++ b/fuel/modules/fuel/helpers/scraper_helper.php
@@ -26,7 +26,6 @@
  * @link		http://docs.getfuelcms.com/helpers/scraper_helper
  */
 
-
 // --------------------------------------------------------------------
 
 if (!function_exists('scrape_html'))
@@ -131,5 +130,6 @@ function is_valid_page($url)
 		return $CI->curl->is_valid($url);
 	}
 }
+
 /* End of file scraper_helper.php */
 /* Location: ./modules/fuel/helpers/scraper_helper.php */
\ No newline at end of file
diff --git a/fuel/modules/fuel/helpers/session_helper.php b/fuel/modules/fuel/helpers/session_helper.php
index 78830c765..e1b7f0a49 100644
--- a/fuel/modules/fuel/helpers/session_helper.php
+++ b/fuel/modules/fuel/helpers/session_helper.php
@@ -26,7 +26,6 @@
  * @link		http://docs.getfuelcms.com/helpers/session_helper
  */
 
-
 // --------------------------------------------------------------------
 
 if (!function_exists('session_userdata'))
@@ -70,6 +69,7 @@ function session_set_userdata($key, $value)
 		return $CI->session->set_userdata($key, $value);
 	}
 }
+
 // --------------------------------------------------------------------
 
 if (!function_exists('session_flashdata'))
@@ -114,5 +114,6 @@ function session_set_flashdata($key, $value)
 		return $CI->session->set_flashdata($key, $value);
 	}
 }
+
 /* End of file session_helper.php */
 /* Location: ./modules/fuel/helpers/session_helper.php */
\ No newline at end of file
diff --git a/fuel/modules/fuel/helpers/simplepie_helper.php b/fuel/modules/fuel/helpers/simplepie_helper.php
index 96600dd38..10fca4275 100644
--- a/fuel/modules/fuel/helpers/simplepie_helper.php
+++ b/fuel/modules/fuel/helpers/simplepie_helper.php
@@ -26,7 +26,6 @@
  * @link		http://docs.getfuelcms.com/helpers/simplepie_helper
  */
 
-
 // --------------------------------------------------------------------
 
 if (!function_exists('simplepie'))
diff --git a/fuel/modules/fuel/helpers/social_helper.php b/fuel/modules/fuel/helpers/social_helper.php
index 8c29ba369..b0545eb16 100644
--- a/fuel/modules/fuel/helpers/social_helper.php
+++ b/fuel/modules/fuel/helpers/social_helper.php
@@ -26,7 +26,6 @@
  * @link		http://docs.getfuelcms.com/helpers/social_helper
  */
 
-
 // --------------------------------------------------------------------
 
 if (!function_exists('share'))
@@ -50,6 +49,8 @@ function share($type, $values = NULL)
 	}
 }
 
+// --------------------------------------------------------------------
+
 if (!function_exists('og'))
 {
 	/**
@@ -70,6 +71,8 @@ function og($values)
 	}
 }
 
+// --------------------------------------------------------------------
+
 if (!function_exists('social_popup_js'))
 {
 	/**
diff --git a/fuel/modules/fuel/helpers/validator_helper.php b/fuel/modules/fuel/helpers/validator_helper.php
index 9a9741a6f..d2969757f 100644
--- a/fuel/modules/fuel/helpers/validator_helper.php
+++ b/fuel/modules/fuel/helpers/validator_helper.php
@@ -28,7 +28,6 @@
  * @link		http://docs.getfuelcms.com/helpers/validator_helper
  */
 
-
 // --------------------------------------------------------------------
 
 if (!function_exists('required'))
@@ -133,6 +132,7 @@ function valid_email($email)
 		}
 	}
 } 
+
 // --------------------------------------------------------------------
 
 if (!function_exists('min_num'))
@@ -272,6 +272,7 @@ function length_min($str, $limit = 1)
 		}
 	}
 }
+
 // --------------------------------------------------------------------
 
 if (!function_exists('valid_phone'))
@@ -913,6 +914,7 @@ function add_errors($errors)
 		}
 	}
 }
+
 // --------------------------------------------------------------------
 
 if (!function_exists('get_error'))
@@ -958,5 +960,6 @@ function get_errors()
 		return NULL;
 	}
 }
+
 /* End of file validator_helper.php */
 /* Location: ./modules/fuel/helpers/validator_helper.php */
\ No newline at end of file

From 34f4c40e32e3749e7c482f32169a4ea70098c755 Mon Sep 17 00:00:00 2001
From: Martynas Sateika <martynas.sateika@gmail.com>
Date: Sun, 18 Mar 2018 03:17:37 +0000
Subject: [PATCH 011/129] Add missing PHPDoc parameters, fix incorrect return
 values

---
 fuel/modules/fuel/helpers/MY_array_helper.php |  1 -
 fuel/modules/fuel/helpers/MY_date_helper.php  | 22 ++++++++--------
 .../fuel/helpers/MY_directory_helper.php      |  9 ++++---
 fuel/modules/fuel/helpers/MY_file_helper.php  |  1 +
 .../modules/fuel/helpers/MY_string_helper.php |  1 +
 fuel/modules/fuel/helpers/MY_url_helper.php   |  5 ++--
 fuel/modules/fuel/helpers/asset_helper.php    | 19 ++++++++------
 fuel/modules/fuel/helpers/browser_helper.php  |  2 +-
 .../fuel/helpers/compatibility_helper.php     |  1 -
 fuel/modules/fuel/helpers/convert_helper.php  |  3 ++-
 fuel/modules/fuel/helpers/format_helper.php   |  5 +++-
 fuel/modules/fuel/helpers/google_helper.php   | 25 ++++++++++---------
 fuel/modules/fuel/helpers/session_helper.php  |  1 +
 .../modules/fuel/helpers/simplepie_helper.php |  4 +--
 fuel/modules/fuel/helpers/utility_helper.php  |  2 ++
 .../modules/fuel/helpers/validator_helper.php |  6 ++---
 16 files changed, 59 insertions(+), 48 deletions(-)

diff --git a/fuel/modules/fuel/helpers/MY_array_helper.php b/fuel/modules/fuel/helpers/MY_array_helper.php
index 3278faf1c..87b010305 100644
--- a/fuel/modules/fuel/helpers/MY_array_helper.php
+++ b/fuel/modules/fuel/helpers/MY_array_helper.php
@@ -212,7 +212,6 @@ function parse_string_to_array($str)
 			}
 		}
 		return $params;
-		
 	}
 }
 
diff --git a/fuel/modules/fuel/helpers/MY_date_helper.php b/fuel/modules/fuel/helpers/MY_date_helper.php
index b1068a395..1f8298534 100644
--- a/fuel/modules/fuel/helpers/MY_date_helper.php
+++ b/fuel/modules/fuel/helpers/MY_date_helper.php
@@ -26,7 +26,6 @@
  * @link		http://docs.getfuelcms.com/helpers/my_date_helper
  */
 
-
 // --------------------------------------------------------------------
 
 if (!function_exists('date_formatter'))
@@ -191,7 +190,7 @@ function english_date($date, $long = FALSE, $timezone = NULL, $delimiter = '/')
 	 *
 	 * @access	public
 	 * @param	string
-	 * @return	boolean
+	 * @return	boolean|string
 	 */
 	function english_date_verbose($date)
 	{
@@ -377,7 +376,6 @@ function format_db_date($y = NULL, $m = NULL, $d = NULL, $h = NULL, $i = NULL, $
 	 */
 	function date_range_string($date1, $date2, $params = array())
 	{
-		
 		// set formatting defaults
 		$format['same_day_and_time'] = 'F j, Y h:ia';
 		$format['same_day'] = array('F j, h:ia', 'h:ia');
@@ -440,7 +438,7 @@ function date_range_string($date1, $date2, $params = array())
 	 *
 	 * @access	public
 	 * @param	string
-	 * @param	booelan
+	 * @param	boolean
 	 * @return	string
 	 */
 	function pretty_date($timestamp, $use_gmt = FALSE)
@@ -591,7 +589,7 @@ function timestamp($date = NULL)
 if (!function_exists('month'))
 {
 	/**
-	 * Returns a the month value of a provided date
+	 * Returns the month value of a provided date
 	 *
 	 * @access	public
 	 * @param	string date (optional)
@@ -620,7 +618,7 @@ function month($date = NULL, $format = 'M')
 if (!function_exists('day'))
 {
 	/**
-	 * Returns a the day value of a provided date
+	 * Returns the day value of a provided date
 	 *
 	 * @access	public
 	 * @param	string date (optional)
@@ -644,7 +642,7 @@ function day($date = NULL, $format = 'j')
 if (!function_exists('weekday'))
 {
 	/**
-	 * Returns a the weekday value of a provided date
+	 * Returns the weekday value of a provided date
 	 *
 	 * @access	public
 	 * @param	string date (optional)
@@ -671,7 +669,7 @@ function weekday($date = NULL, $format = 'D')
 if (!function_exists('year'))
 {
 	/**
-	 * Returns a the year value of a provided date
+	 * Returns the year value of a provided date
 	 *
 	 * @access	public
 	 * @param	string date (optional)
@@ -696,7 +694,7 @@ function year($date = NULL, $format = 'Y')
 if (!function_exists('hour'))
 {
 	/**
-	 * Returns a the weekday value of a provided date
+	 * Returns the hour value of a provided date
 	 *
 	 * @access	public
 	 * @param	string date (optional)
@@ -721,7 +719,7 @@ function hour($date = NULL, $format = '12')
 if (!function_exists('minute'))
 {
 	/**
-	 * Returns a the weekday value of a provided date
+	 * Returns the minute value of a provided date
 	 *
 	 * @access	public
 	 * @param	string date (optional)
@@ -744,7 +742,7 @@ function minute($date = NULL, $format = 'leading')
 if (!function_exists('second'))
 {
 	/**
-	 * Returns a the weekday value of a provided date
+	 * Returns the second value of a provided date
 	 *
 	 * @access	public
 	 * @param	string date (optional)
@@ -767,7 +765,7 @@ function second($date = NULL, $format = 'leading')
 if (!function_exists('ampm'))
 {
 	/**
-	 * Returns a the ampm value of a provided date
+	 * Returns the ampm value of a provided date
 	 *
 	 * @access	public
 	 * @param	string date (optional)
diff --git a/fuel/modules/fuel/helpers/MY_directory_helper.php b/fuel/modules/fuel/helpers/MY_directory_helper.php
index c2735fa69..b28984c35 100644
--- a/fuel/modules/fuel/helpers/MY_directory_helper.php
+++ b/fuel/modules/fuel/helpers/MY_directory_helper.php
@@ -39,7 +39,7 @@
 	 * @access	public
 	 * @param 	string
 	 * @param 	string
-	 * @return	array
+	 * @return	boolean|array
 	 */
 	function copyr($source, $dest)
 	{
@@ -83,7 +83,7 @@ function copyr($source, $dest)
 
 		// Clean up
 		$dir->close();
-		return true;
+		return TRUE;
 	}
 }
 
@@ -97,7 +97,7 @@ function copyr($source, $dest)
 	 *  from php.net/chmod
 	 * @access	public
 	 * @param 	string
-	 * @param 	octal
+	 * @param 	int      file mode (octal value)
 	 * @return	boolean
 	 */
 	function chmodr($path, $filemode) { 
@@ -200,7 +200,7 @@ function directory_to_array($directory, $recursive = TRUE, $exclude = array(), $
 if (!function_exists('list_directories'))
 {
 	/**
-	 * Lists the directories only from a give directory
+	 * Lists the directories only from a given directory
 	 *
 	 * @access	public
 	 * @param 	string
@@ -273,5 +273,6 @@ function list_directories($directory, $exclude = array(), $full_path = TRUE, $is
 		return $dirs;
 	}
 }
+
 /* End of file MY_directory_helper.php */
 /* Location: ./modules/fuel/helpers/MY_directory_helper.php */
\ No newline at end of file
diff --git a/fuel/modules/fuel/helpers/MY_file_helper.php b/fuel/modules/fuel/helpers/MY_file_helper.php
index e25da6cfc..6cbc4d6a2 100644
--- a/fuel/modules/fuel/helpers/MY_file_helper.php
+++ b/fuel/modules/fuel/helpers/MY_file_helper.php
@@ -195,5 +195,6 @@ function is_image_file($path)
 		return FALSE;
 	}
 }
+
 /* End of file MY_file_helper.php */
 /* Location: ./modules/fuel/helpers/MY_file_helper.php */
\ No newline at end of file
diff --git a/fuel/modules/fuel/helpers/MY_string_helper.php b/fuel/modules/fuel/helpers/MY_string_helper.php
index 6c56b20bb..b1904aba2 100644
--- a/fuel/modules/fuel/helpers/MY_string_helper.php
+++ b/fuel/modules/fuel/helpers/MY_string_helper.php
@@ -248,6 +248,7 @@ function safe_htmlentities($str, $protect_amp = TRUE)
  * Convert PHP syntax to templating syntax
  *
  * @param 	string 	string to evaluate
+ * @param   string  the templating engine to use
  * @return	string
  */
 function php_to_template_syntax($str, $engine = NULL)
diff --git a/fuel/modules/fuel/helpers/MY_url_helper.php b/fuel/modules/fuel/helpers/MY_url_helper.php
index dece02025..6c1141316 100644
--- a/fuel/modules/fuel/helpers/MY_url_helper.php
+++ b/fuel/modules/fuel/helpers/MY_url_helper.php
@@ -129,7 +129,7 @@ function current_url($show_query_str = FALSE, $lang = NULL)
 	 *
 	 * @access	public
 	 * @param	boolean	use the rerouted URI string?
-	 * @param	boolean	the start index to build the uri path
+	 * @param	int	    the start index to build the uri path
 	 * @param	boolean	determines whether to strip any language segments
 	 * @return	string
 	 */
@@ -222,6 +222,7 @@ function is_http_path($path)
 	 * Determines if the page is the homepage or not
 	 *
 	 * @access	public
+	 * @param   string
 	 * @return	boolean
 	 */
 	function is_home($uri_path = NULL)
@@ -380,7 +381,7 @@ function redirect_404($redirect = TRUE)
 	 * @access	public
 	 * @param	string	the URL
 	 * @param	string	the method: location or redirect
-	 * @param	string	the http response code
+	 * @param	int		the http response code
 	 * @param	string	wether to force or not https
 	 * @param	boolean	wether add the language to the URI
 	 * @return	string
diff --git a/fuel/modules/fuel/helpers/asset_helper.php b/fuel/modules/fuel/helpers/asset_helper.php
index 77d30e9cc..725059158 100644
--- a/fuel/modules/fuel/helpers/asset_helper.php
+++ b/fuel/modules/fuel/helpers/asset_helper.php
@@ -3,7 +3,7 @@
  * FUEL CMS
  * http://www.getfuelcms.com
  *
- * An open source Content Management System based on the 
+ * An open source Content Management System based on the
  * Codeigniter framework (http://codeigniter.com)
  *
  * @package		FUEL CMS
@@ -19,8 +19,8 @@
 /**
  * FUEL Asset Helper
  *
- * This helper allows you to output css, js links and/or files as well as 
- * allows you to compress and cache them. Also has convenience methods for 
+ * This helper allows you to output css, js links and/or files as well as
+ * allows you to compress and cache them. Also has convenience methods for
  * paths to assets. It is essentially an alias to the Asset Class.
  *
  * @package		FUEL CMS
@@ -258,9 +258,10 @@ function assets_server_path($file = NULL, $path = NULL, $module = NULL)
 	/**
 	 * Convert a server path to a web path
 	 *
-	 * @access	public
-	 * @param	string	server path to asset file
-	 * @return	string
+	 * @access  public
+	 * @param   string  server path to asset file
+	 * @param   bool    truncate to asset folder
+	 * @return  string
 	 */
 	function assets_server_to_web_path($file, $truncate_to_asset_folder = FALSE)
 	{
@@ -378,8 +379,10 @@ function css($path, $module = '', $options = array())
 	 *
 	 * @access	public
 	 * @param	string	file name of the swf file including extension
-	 * @param	string	module module folder if any
-	 * @param	array	additional parameter to include (attrs, ie_conditional, and output)
+	 * @param	string	html id that the flash will replace with swfobject
+	 * @param	int		width of the flash file
+	 * @param	int		height of the flash file
+	 * @param	array	additional parameter to include (vars, version, and color, params)
 	 * @return	string
 	 */
 	function swf($flash, $id, $width, $height, $options = array()){
diff --git a/fuel/modules/fuel/helpers/browser_helper.php b/fuel/modules/fuel/helpers/browser_helper.php
index 522a23f21..fd8477646 100644
--- a/fuel/modules/fuel/helpers/browser_helper.php
+++ b/fuel/modules/fuel/helpers/browser_helper.php
@@ -26,7 +26,6 @@
  * @link		http://docs.getfuelcms.com/helpers/browser_helper
  */
 
-
 // --------------------------------------------------------------------
 
 if (!function_exists('browser_info'))
@@ -60,5 +59,6 @@ function browser_info($agent = NULL)
 		return array($matches['browser'][$i] => $matches['version'][$i]);
 	}
 }
+
 /* End of file browser_helper.php */
 /* Location: ./modules/fuel/helpers/browser_helper.php */
diff --git a/fuel/modules/fuel/helpers/compatibility_helper.php b/fuel/modules/fuel/helpers/compatibility_helper.php
index ea002e2f3..61b7f558e 100644
--- a/fuel/modules/fuel/helpers/compatibility_helper.php
+++ b/fuel/modules/fuel/helpers/compatibility_helper.php
@@ -27,7 +27,6 @@
  * @link		http://docs.getfuelcms.com/helpers/compatibility_helper
  */
 
-
 // --------------------------------------------------------------------
 
 if (!function_exists('json_encode'))
diff --git a/fuel/modules/fuel/helpers/convert_helper.php b/fuel/modules/fuel/helpers/convert_helper.php
index 851dd2fa2..632dfea69 100644
--- a/fuel/modules/fuel/helpers/convert_helper.php
+++ b/fuel/modules/fuel/helpers/convert_helper.php
@@ -128,6 +128,7 @@ function uri_safe_decode($str, $hexify = TRUE)
 	 *
 	 * @access	public
 	 * @param	string	string to be converted
+	 * @param   string  delimiter to join values with
 	 * @param	boolean	value is hexified
 	 * @return	string
 	 */
@@ -168,7 +169,7 @@ function uri_safe_batch_encode($uri, $delimiter = '|', $hexify = TRUE)
 	 * @param	string	string to be converted
 	 * @param	string	delimiter to split string
 	 * @param	boolean	value is hexified
-	 * @return	string
+	 * @return	array
 	 */
 	function uri_safe_batch_decode($str, $delimiter = '|', $hexify = TRUE)
 	{
diff --git a/fuel/modules/fuel/helpers/format_helper.php b/fuel/modules/fuel/helpers/format_helper.php
index ab317db22..06a42871c 100644
--- a/fuel/modules/fuel/helpers/format_helper.php
+++ b/fuel/modules/fuel/helpers/format_helper.php
@@ -34,8 +34,11 @@
 	 * Formats value into a currency string
 	 *
 	 * @access	public
-	 * @param	string
+	 * @param	string  value to format
+	 * @param   string  currency symbol
 	 * @param	bool	whether to include the cents or not
+	 * @param   string  decimal separator
+	 * @param   string  thousands separator
 	 * @return	string
 	 */
 	function currency($value, $symbol = '$',  $include_cents = TRUE, $decimal_sep = '.', $thousands_sep = ',')
diff --git a/fuel/modules/fuel/helpers/google_helper.php b/fuel/modules/fuel/helpers/google_helper.php
index 94de4cbf6..66a52b6b3 100644
--- a/fuel/modules/fuel/helpers/google_helper.php
+++ b/fuel/modules/fuel/helpers/google_helper.php
@@ -38,7 +38,7 @@
 	* Otherwise, it will use the value defined in the google.php config file
 	* If both values do not exist, nothing will be inserted.
 	*
-	* @access    public
+	* @access   public
 	* @param    string	The google account number (optional)
 	* @param    mixed	An array or string of extra parameters to pass to GA. An array will use the key/value to add _gaq.push (optional)
 	* @param    boolean	Whether to check dev mode before adding it in (optional)
@@ -115,7 +115,7 @@ function google_uanalytics($uacct = '', $other_params = array(), $check_devmode
 	* Otherwise, it will use the value defined in the google.php config file
 	* If both values do not exist, nothing will be inserted.
 	*
-	* @access    public
+	* @access   public
 	* @param    string	The google account number (optional)
 	* @param    mixed	An array or string of extra parameters to pass to GA. An array will use the key/value to add _gaq.push (optional)
 	* @param    boolean	Whether to check dev mode before adding it in (optional)
@@ -193,9 +193,9 @@ function google_analytics($uacct = '', $other_params = array(), $check_devmode =
 	*
 	* Returns an iframed Google map
 	*
-	* @access    public
-	* @param    mixed	Address can be either an array with "address", "city", "state" or simply a string
-	* @param    array	An array of additional map parameter that that includes, "height", "width", hl" (language), "z" (zoom), "t" (map type), "om", (overview map), "iwloc" (display info bubble), "ll" (lat,lng). Friendly names of "display_info" (iwloc), "map_type" (t), and "overview" (om) can be used. (optional)
+	* @access   public
+	* @param    mixed	address can be either an array with "address", "city", "state" or simply a string
+	* @param    array	additional map parameters that include "height", "width", hl" (language), "z" (zoom), "t" (map type), "om", (overview map), "iwloc" (display info bubble), "ll" (lat,lng). Friendly names of "display_info" (iwloc), "map_type" (t), and "overview" (om) can be used. (optional)
 	* @return   string
 	*/
 	function google_map($address, $params = array())
@@ -226,9 +226,9 @@ function google_map($address, $params = array())
 	*
 	* Returns a google map URL (used by the google_map function too)
 	*
-	* @access    public
-	* @param    mixed	Address can be either an array with "address", "city", "state" or simply a string. You can also pass lat and lng values as an array
-	* @param    array	An array of additional map parameter that that includes, "hl" (language), "z" (zoom), "t" (map type), "om", (overview map), "iwloc" (display info bubble), "ll" (lat,lng). Friendly names of "display_info" (iwloc), "map_type" (t), and "overview" (om) can be used. (optional)
+	* @access   public
+	* @param    mixed	address can be either an array with "address", "city", "state" or simply a string. You can also pass lat and lng values as an array
+	* @param    array	additional map parameters that include "hl" (language), "z" (zoom), "t" (map type), "om", (overview map), "iwloc" (display info bubble), "ll" (lat,lng). Friendly names of "display_info" (iwloc), "map_type" (t), and "overview" (om) can be used. (optional)
 	* @return   string
 	*/
 	function google_map_url($address, $params = array())
@@ -342,10 +342,11 @@ function google_map_url($address, $params = array())
 	* Use sleep() or usleep() functions to meter multiple requests (10/s is limit I believe)
 	* More on the return types here: https://developers.google.com/maps/documentation/geocoding/
 	*
-	* @access    public
-	* @param    mixed	Address can be either an array with "address", "city", "state" or simply a string
-	* @param    mixed	Return type can be 'all' (default), 'address_components', 'formatted_address', 'geometry', 'location', 'street_number', 'route', 'neighborhood', 'city',  'county', 'state', 'country', 'zip' (optional)
-	* @return   mixed  usually an array (e.g. array('latitude' => xxxx, 'longitude' => xxxx))
+	* @access   public
+	* @param    mixed	address can be either an array with "address", "city", "state" or simply a string
+	* @param    mixed	return type can be 'all' (default), 'address_components', 'formatted_address', 'geometry', 'location', 'street_number', 'route', 'neighborhood', 'city',  'county', 'state', 'country', 'zip' (optional)
+	* @param    bool    whether to return value under 'short_name' or 'long_name' if defined in result
+	* @return   mixed   usually an array (e.g. array('latitude' => xxxx, 'longitude' => xxxx))
 	*/
 	function google_geolocate($data, $return = 'all', $long = TRUE)
 	{
diff --git a/fuel/modules/fuel/helpers/session_helper.php b/fuel/modules/fuel/helpers/session_helper.php
index e1b7f0a49..e8009360b 100644
--- a/fuel/modules/fuel/helpers/session_helper.php
+++ b/fuel/modules/fuel/helpers/session_helper.php
@@ -102,6 +102,7 @@ function session_flashdata($key)
 	 *
 	 * @access	public
 	 * @param	string	variable name
+	 * @param   string  value
 	 * @return	boolean
 	 */
 	function session_set_flashdata($key, $value)
diff --git a/fuel/modules/fuel/helpers/simplepie_helper.php b/fuel/modules/fuel/helpers/simplepie_helper.php
index 10fca4275..501d932c9 100644
--- a/fuel/modules/fuel/helpers/simplepie_helper.php
+++ b/fuel/modules/fuel/helpers/simplepie_helper.php
@@ -35,8 +35,8 @@
 	 *
 	 * @access	public
 	 * @param	string	Feed URL
-	 * @param	string	The number of results to return
-	 * @param	string	Additional parameters which include, cache_duration, enable_order_by_date, enable_cache and cache_location
+	 * @param	int		The number of results to return
+	 * @param	array	Additional parameters which include, cache_duration, enable_order_by_date, enable_cache and cache_location
 	 * @return	object
 	 */
 	function simplepie($feed, $limit = 5, $params = array())
diff --git a/fuel/modules/fuel/helpers/utility_helper.php b/fuel/modules/fuel/helpers/utility_helper.php
index 2ed4bb205..81081aa70 100644
--- a/fuel/modules/fuel/helpers/utility_helper.php
+++ b/fuel/modules/fuel/helpers/utility_helper.php
@@ -243,6 +243,8 @@ function is_dev_mode()
 	/**
 	 * Returns whether the current environment is equal to the passed environment
 	 *
+	 * @access  public
+	 * @param   string   environment to test
 	 * @return 	boolean
 	 */
 	function is_environment($environment)
diff --git a/fuel/modules/fuel/helpers/validator_helper.php b/fuel/modules/fuel/helpers/validator_helper.php
index d2969757f..bc78746d6 100644
--- a/fuel/modules/fuel/helpers/validator_helper.php
+++ b/fuel/modules/fuel/helpers/validator_helper.php
@@ -878,11 +878,11 @@ function has_errors()
 	 * @access	public
 	 * @param	string error message
 	 * @param	string key value for error message array
-	 * @return	boolean
+	 * @return	void
 	 */
 	function add_error($msg, $key = NULL)
 	{
-		if(defined('GLOBAL_ERRORS')) 
+		if(defined('GLOBAL_ERRORS'))
 		{
 			if(empty($key)) 
 			{
@@ -903,7 +903,7 @@ function add_error($msg, $key = NULL)
 	 * @access	public
 	 * @param	string error message
 	 * @param	string key value for error message array
-	 * @return	boolean
+	 * @return	void
 	 */
 	function add_errors($errors)
 	{

From 880b788c848ecb9ca4f6ad2ef72771d92a6cf6a0 Mon Sep 17 00:00:00 2001
From: Martynas Sateika <martynas.sateika@gmail.com>
Date: Sun, 18 Mar 2018 03:58:14 +0000
Subject: [PATCH 012/129] Fix whitespace issues (hopefully)

---
 fuel/modules/fuel/helpers/MY_array_helper.php | 22 ++++-----
 fuel/modules/fuel/helpers/MY_date_helper.php  | 38 +++++++--------
 .../fuel/helpers/MY_directory_helper.php      | 28 +++++------
 fuel/modules/fuel/helpers/MY_file_helper.php  | 22 ++++-----
 fuel/modules/fuel/helpers/MY_html_helper.php  | 16 +++----
 .../fuel/helpers/MY_language_helper.php       | 10 ++--
 .../modules/fuel/helpers/MY_string_helper.php | 40 ++++++++--------
 fuel/modules/fuel/helpers/MY_url_helper.php   | 10 ++--
 fuel/modules/fuel/helpers/asset_helper.php    |  8 ++--
 fuel/modules/fuel/helpers/browser_helper.php  |  2 +-
 fuel/modules/fuel/helpers/convert_helper.php  |  2 +-
 fuel/modules/fuel/helpers/format_helper.php   |  8 ++--
 fuel/modules/fuel/helpers/google_helper.php   | 46 +++++++++----------
 fuel/modules/fuel/helpers/session_helper.php  |  2 +-
 fuel/modules/fuel/helpers/utility_helper.php  | 22 ++++-----
 .../modules/fuel/helpers/validator_helper.php | 28 +++++------
 16 files changed, 152 insertions(+), 152 deletions(-)

diff --git a/fuel/modules/fuel/helpers/MY_array_helper.php b/fuel/modules/fuel/helpers/MY_array_helper.php
index 87b010305..89acd9b53 100644
--- a/fuel/modules/fuel/helpers/MY_array_helper.php
+++ b/fuel/modules/fuel/helpers/MY_array_helper.php
@@ -35,9 +35,9 @@
 	 * An alternative array sorter that is a bit faster then array_sorter
 	 *
 	 * @access	public
-	 * @param	array 	The array of data
-	 * @param	string 	The column to sort by
-	 * @param	string 	The direction (asc/desc)
+	 * @param	array	The array of data
+	 * @param	string	The column to sort by
+	 * @param	string	The direction (asc/desc)
 	 * @return	array
 	 */
 	function array_orderby()
@@ -246,10 +246,10 @@ function array_group($array, $groups)
 	 * Converts a .csv file to an associative array. Must have header row.
 	 *
 	 * @access	public
-	 * @param	string  file name
-	 * @param	string  the delimiter that separates each column
-	 * @param	int     the index for where the header row starts
-	 * @param	int     must be greater then the maximum line length. Setting to 0 is slightly slower, but works for any length
+	 * @param	string	file name
+	 * @param	string	the delimiter that separates each column
+	 * @param	int		the index for where the header row starts
+	 * @param	int		must be greater then the maximum line length. Setting to 0 is slightly slower, but works for any length
 	 * @return	array
 	 */
 	function csv_to_array($filename = '', $delimiter =  ',', $header_row = 0, $length = 0)
@@ -293,10 +293,10 @@ function csv_to_array($filename = '', $delimiter =  ',', $header_row = 0, $lengt
 	 * credit: borrowed from Vanilla forums GetValueR function
 	 *
 	 * @access	public
-	 * @param 	mixed $array The array or object to search.
-	 * @param 	string $key The key or property name of the value.
-	 * @param 	mixed $default The value to return if the key does not exist.
-	 * @return 	mixed The value from the array or object.
+	 * @param	mixed	$array		The array or object to search.
+	 * @param	string	$key		The key or property name of the value.
+	 * @param	mixed	$default	The value to return if the key does not exist.
+	 * @return	mixed				The value from the array or object.
 	 */
 	function array_get($array, $key, $default = FALSE)
 	{
diff --git a/fuel/modules/fuel/helpers/MY_date_helper.php b/fuel/modules/fuel/helpers/MY_date_helper.php
index 1f8298534..909137aea 100644
--- a/fuel/modules/fuel/helpers/MY_date_helper.php
+++ b/fuel/modules/fuel/helpers/MY_date_helper.php
@@ -213,7 +213,7 @@ function english_date_verbose($date)
 	/**
 	 * Returns the time into a verbose format (e.g. 12hrs 10mins 10secs)
 	 *
-	 * must be passed a string in hh:mm format
+	 * Must be passed a string in hh:mm format
 	 *
 	 * @access	public
 	 * @param	string
@@ -570,7 +570,7 @@ function standard_date($fmt = 'DATE_RFC822', $time = '')
 	 * Returns a timestamp from the provided time
 	 *
 	 * @access	public
-	 * @param	string date (optional)
+	 * @param	string	date (optional)
 	 * @return	string
 	 */
 	function timestamp($date = NULL)
@@ -592,8 +592,8 @@ function timestamp($date = NULL)
 	 * Returns the month value of a provided date
 	 *
 	 * @access	public
-	 * @param	string date (optional)
-	 * @param	string options are 'm/numeric', 'F/long', 'M/short' <- default  (optional)
+	 * @param	string	date (optional)
+	 * @param	string	options are 'm/numeric', 'F/long', 'M/short' <- default  (optional)
 	 * @return	string
 	 */
 	function month($date = NULL, $format = 'M')
@@ -621,8 +621,8 @@ function month($date = NULL, $format = 'M')
 	 * Returns the day value of a provided date
 	 *
 	 * @access	public
-	 * @param	string date (optional)
-	 * @param	string options are 'd/leading', 'j' <- default  (optional)
+	 * @param	string	date (optional)
+	 * @param	string	options are 'd/leading', 'j' <- default  (optional)
 	 * @return	string
 	 */
 	function day($date = NULL, $format = 'j')
@@ -645,8 +645,8 @@ function day($date = NULL, $format = 'j')
 	 * Returns the weekday value of a provided date
 	 *
 	 * @access	public
-	 * @param	string date (optional)
-	 * @param	string options are 'l/full', 'N/numeric', 'D' <- default (optional)
+	 * @param	string	date (optional)
+	 * @param	string	options are 'l/full', 'N/numeric', 'D' <- default (optional)
 	 * @return	string
 	 */
 	function weekday($date = NULL, $format = 'D')
@@ -672,8 +672,8 @@ function weekday($date = NULL, $format = 'D')
 	 * Returns the year value of a provided date
 	 *
 	 * @access	public
-	 * @param	string date (optional)
-	 * @param	string options are 'y/short', 'Y/long' <- default (optional)
+	 * @param	string	date (optional)
+	 * @param	string	options are 'y/short', 'Y/long' <- default (optional)
 	 * @return	string
 	 */
 	function year($date = NULL, $format = 'Y')
@@ -697,8 +697,8 @@ function year($date = NULL, $format = 'Y')
 	 * Returns the hour value of a provided date
 	 *
 	 * @access	public
-	 * @param	string date (optional)
-	 * @param	string options are '24/military', '12' <- default (optional)
+	 * @param	string	date (optional)
+	 * @param	string	options are '24/military', '12' <- default (optional)
 	 * @return	string
 	 */
 	function hour($date = NULL, $format = '12')
@@ -722,8 +722,8 @@ function hour($date = NULL, $format = '12')
 	 * Returns the minute value of a provided date
 	 *
 	 * @access	public
-	 * @param	string date (optional)
-	 * @param	string options are 'noleading', 'leading' <- default (optional)
+	 * @param	string	date (optional)
+	 * @param	string	options are 'noleading', 'leading' <- default (optional)
 	 * @return	string
 	 */
 	function minute($date = NULL, $format = 'leading')
@@ -745,8 +745,8 @@ function minute($date = NULL, $format = 'leading')
 	 * Returns the second value of a provided date
 	 *
 	 * @access	public
-	 * @param	string date (optional)
-	 * @param	string options are 'noleading', 'leading' <- default (optional)
+	 * @param	string	date (optional)
+	 * @param	string	options are 'noleading', 'leading' <- default (optional)
 	 * @return	string
 	 */
 	function second($date = NULL, $format = 'leading')
@@ -768,8 +768,8 @@ function second($date = NULL, $format = 'leading')
 	 * Returns the ampm value of a provided date
 	 *
 	 * @access	public
-	 * @param	string date (optional)
-	 * @param	string options are 'A/upper/uppercase', 'a/lower/lowercase' <- default (optional)
+	 * @param	string	date (optional)
+	 * @param	string	options are 'A/upper/uppercase', 'a/lower/lowercase' <- default (optional)
 	 * @return	string
 	 */
 	function ampm($date = NULL, $format = 'a')
@@ -793,7 +793,7 @@ function ampm($date = NULL, $format = 'a')
 	 * Determines whether the time is midnight or not. Helps with dates that are set without time values
 	 *
 	 * @access	public
-	 * @param	string date
+	 * @param	string	date
 	 * @return	string
 	 */
 	function is_midnight($date)
diff --git a/fuel/modules/fuel/helpers/MY_directory_helper.php b/fuel/modules/fuel/helpers/MY_directory_helper.php
index b28984c35..b4e1ec09e 100644
--- a/fuel/modules/fuel/helpers/MY_directory_helper.php
+++ b/fuel/modules/fuel/helpers/MY_directory_helper.php
@@ -37,8 +37,8 @@
 	 * Recursively copies from one directory to another
 	 *
 	 * @access	public
-	 * @param 	string
-	 * @param 	string
+	 * @param	string
+	 * @param	string
 	 * @return	boolean|array
 	 */
 	function copyr($source, $dest)
@@ -96,8 +96,8 @@ function copyr($source, $dest)
 	 *
 	 *  from php.net/chmod
 	 * @access	public
-	 * @param 	string
-	 * @param 	int      file mode (octal value)
+	 * @param	string
+	 * @param	int		file mode (octal value)
 	 * @return	boolean
 	 */
 	function chmodr($path, $filemode) { 
@@ -148,10 +148,10 @@ function chmodr($path, $filemode) {
 	 * Returns an array of file names from a directory
 	 *
 	 * @access	public
-	 * @param 	string
-	 * @param 	boolean
-	 * @param 	mixed
-	 * @param 	boolean
+	 * @param	string
+	 * @param	boolean
+	 * @param	mixed
+	 * @param	boolean
 	 * @return	array
 	 */
 	function directory_to_array($directory, $recursive = TRUE, $exclude = array(), $append_path = TRUE, $no_ext = FALSE, $_first_time = TRUE)
@@ -203,12 +203,12 @@ function directory_to_array($directory, $recursive = TRUE, $exclude = array(), $
 	 * Lists the directories only from a given directory
 	 *
 	 * @access	public
-	 * @param 	string
-	 * @param 	mixed
-	 * @param 	boolean
-	 * @param 	boolean
-	 * @param 	boolean
-	 * @param 	boolean
+	 * @param	string
+	 * @param	mixed
+	 * @param	boolean
+	 * @param	boolean
+	 * @param	boolean
+	 * @param	boolean
 	 * @return	array
 	 */
 	function list_directories($directory, $exclude = array(), $full_path = TRUE, $is_writable = FALSE, $recursive = TRUE, $_first_time = TRUE)
diff --git a/fuel/modules/fuel/helpers/MY_file_helper.php b/fuel/modules/fuel/helpers/MY_file_helper.php
index 6cbc4d6a2..ad6568569 100644
--- a/fuel/modules/fuel/helpers/MY_file_helper.php
+++ b/fuel/modules/fuel/helpers/MY_file_helper.php
@@ -37,9 +37,9 @@
 	 * Gets the directory file info.
 	 *
 	 * @access	public
-	 * @param 	string
-	 * @param 	boolean
-	 * @param 	boolean
+	 * @param	string
+	 * @param	boolean
+	 * @param	boolean
 	 * @return	array
 	 */
 	function get_dir_file_info($source_dir, $top_level_only = TRUE, $include_path = FALSE, $_recursion = FALSE)
@@ -100,10 +100,10 @@ function get_dir_file_info($source_dir, $top_level_only = TRUE, $include_path =
 	 * Deletes files in a directory with the added option to exclude certain files
 	 *
 	 * @access	public
-	 * @param 	string
-	 * @param 	boolean
-	 * @param 	mixed
-	 * @param 	int
+	 * @param	string
+	 * @param	boolean
+	 * @param	mixed
+	 * @param	int
 	 * @return	void
 	 */
 	function delete_files($path, $del_dir = FALSE, $exclude = NULL, $level = 0)
@@ -150,9 +150,9 @@ function delete_files($path, $del_dir = FALSE, $exclude = NULL, $level = 0)
 	 * Deletes files in a directory older then a certain date with the added option to exclude certain files
 	 *
 	 * @access	public
-	 * @param 	string
-	 * @param 	string
-	 * @param 	mixed
+	 * @param	string
+	 * @param	string
+	 * @param	mixed
 	 * @return	void
 	 */
 	function delete_old_files($dir, $older_than, $exclude = array())
@@ -183,7 +183,7 @@ function delete_old_files($dir, $older_than, $exclude = array())
 	 * Determines if the file is an image
 	 *
 	 * @access	public
-	 * @param 	string
+	 * @param	string
 	 * @return	boolean
 	 */
 	function is_image_file($path)
diff --git a/fuel/modules/fuel/helpers/MY_html_helper.php b/fuel/modules/fuel/helpers/MY_html_helper.php
index 1b913dea3..80ba604d6 100644
--- a/fuel/modules/fuel/helpers/MY_html_helper.php
+++ b/fuel/modules/fuel/helpers/MY_html_helper.php
@@ -37,9 +37,9 @@
 	 * Wrap an string or array of values in opening and closing tag
 	 *
 	 * @access	public
-	 * @param 	string 	opening tag element
-	 * @param 	string 	closing tag element
-	 * @param 	mixed 	array of values to be enclosed by tags
+	 * @param	string	opening tag element
+	 * @param	string	closing tag element
+	 * @param	mixed	array of values to be enclosed by tags
 	 * @param	boolean	echo to the screen
 	 * @return	string
 	 */
@@ -74,10 +74,10 @@ function tag($tag, $vals, $attrs = array())
 	 * Wrap a string into an HTML blockquote with quotes and cite added
 	 *
 	 * @access	public
-	 * @param 	string 	string to be enclosed by quote elements
-	 * @param 	string 	string source value
-	 * @param 	string 	string company/position value
-	 * @param 	string 	string css class
+	 * @param	string	string to be enclosed by quote elements
+	 * @param	string	string source value
+	 * @param	string	string company/position value
+	 * @param	string	string css class
 	 * @return	string
 	 */
 	function quote($quote, $cite = NULL, $title = NULL, $class = 'quote')
@@ -114,7 +114,7 @@ function quote($quote, $cite = NULL, $title = NULL, $class = 'quote')
 	 * Create HTML attributes
 	 *
 	 * @access	public
-	 * @param 	mixed 	HTML attributs
+	 * @param	mixed	HTML attributs
 	 * @return	string
 	 */
 	function html_attrs($attrs)
diff --git a/fuel/modules/fuel/helpers/MY_language_helper.php b/fuel/modules/fuel/helpers/MY_language_helper.php
index d9e8deeb0..5399d1d0f 100644
--- a/fuel/modules/fuel/helpers/MY_language_helper.php
+++ b/fuel/modules/fuel/helpers/MY_language_helper.php
@@ -37,8 +37,8 @@
 	 * Get translated local strings with arguments.
 	 * Overwrites CI langauge_helper to have a more useful args
 	 *
-	 * @param 	string
-	 * @param 	mixed
+	 * @param	string
+	 * @param	mixed
 	 * @return	string
 	 */
 	function lang($key, $args = NULL)
@@ -73,8 +73,8 @@ function lang($key, $args = NULL)
 	/**
 	 * Creates an array or JSON aobject for your javascript files that need localization
 	 *
-	 * @param 	array
-	 * @param 	boolean
+	 * @param	array
+	 * @param	boolean
 	 * @return	string
 	 */
 	function json_lang($js_localized = array(), $return_json = TRUE)
@@ -135,7 +135,7 @@ function json_lang($js_localized = array(), $return_json = TRUE)
 	/**
 	 * Detects any specified language settings pulling from the URI, query string and then the user's browser settings
 	 *
-	 * @param 	boolean	Determines whether to set the "langauge" config property
+	 * @param	boolean	Determines whether to set the "langauge" config property
 	 * @return	string
 	 */
 	function detect_lang($set_config = FALSE)
diff --git a/fuel/modules/fuel/helpers/MY_string_helper.php b/fuel/modules/fuel/helpers/MY_string_helper.php
index b1904aba2..9607810a0 100644
--- a/fuel/modules/fuel/helpers/MY_string_helper.php
+++ b/fuel/modules/fuel/helpers/MY_string_helper.php
@@ -37,8 +37,8 @@
 	/**
 	 * Evaluates a strings PHP code. Used especially for outputing FUEL page data
 	 *
-	 * @param 	string 	string to evaluate
-	 * @param 	mixed 	variables to pass to the string
+	 * @param	string	string to evaluate
+	 * @param	mixed	variables to pass to the string
 	 * @return	string
 	 */
 	function eval_string($str, $vars = array())
@@ -74,9 +74,9 @@ function eval_string($str, $vars = array())
 	/**
 	 * Add an s to the end of s string based on the number
 	 *
-	 * @param 	int 	number to compare against to determine if it needs to be plural
-	 * @param 	string 	string to evaluate
-	 * @param 	string 	plural value to add
+	 * @param	int		number to compare against to determine if it needs to be plural
+	 * @param	string	string to evaluate
+	 * @param	string	plural value to add
 	 * @return	string
 	 */
 	function pluralize($num, $str = '', $plural = 's')
@@ -101,7 +101,7 @@ function pluralize($num, $str = '', $plural = 's')
 	/**
 	 * Strips extra whitespace from a string
 	 *
-	 * @param 	string
+	 * @param	string
 	 * @return	string
 	 */
 	function strip_whitespace($str)
@@ -117,7 +117,7 @@ function strip_whitespace($str)
 	/**
 	 * Trims extra whitespace from the end and beginning of a string on multiple lines
 	 *
-	 * @param 	string
+	 * @param	string
 	 * @return	string
 	 */
 	function trim_multiline($str)
@@ -133,8 +133,8 @@ function trim_multiline($str)
 	/**
 	 * Converts words to title case and allows for exceptions
 	 *
-	 * @param 	string 	string to evaluate
-	 * @param 	mixed 	variables to pass to the string
+	 * @param	string	string to evaluate
+	 * @param	mixed	variables to pass to the string
 	 * @return	string
 	 */
 	function smart_ucwords($str, $exceptions = array('of', 'the'))
@@ -159,8 +159,8 @@ function smart_ucwords($str, $exceptions = array('of', 'the'))
 	 *
 	 * (hidden control characters that the remove_invisible_characters function misses)
 	 *
-	 * @param 	string 	string to evaluate
-	 * @param 	string 	the value used to replace a gremlin
+	 * @param	string	string to evaluate
+	 * @param	string	the value used to replace a gremlin
 	 * @return	string
 	 */
 	function zap_gremlins($str, $replace = '')
@@ -179,7 +179,7 @@ function zap_gremlins($str, $replace = '')
 	/**
 	 * Removes javascript from a string
 	 *
-	 * @param 	string 	string to remove javascript
+	 * @param	string	string to remove javascript
 	 * @return	string
 	 */
 	function strip_javascript($str)
@@ -196,8 +196,8 @@ function strip_javascript($str)
 	/**
 	 * Safely converts a string's entities without encoding HTML tags and quotes
 	 *
-	 * @param 	string 	string to evaluate
-	 * @param 	boolean determines whether to encode the ampersand or not
+	 * @param	string	string to evaluate
+	 * @param	boolean	determines whether to encode the ampersand or not
 	 * @return	string
 	 */
 	function safe_htmlentities($str, $protect_amp = TRUE)
@@ -247,8 +247,8 @@ function safe_htmlentities($str, $protect_amp = TRUE)
 /**
  * Convert PHP syntax to templating syntax
  *
- * @param 	string 	string to evaluate
- * @param   string  the templating engine to use
+ * @param	string	string to evaluate
+ * @param	string	the templating engine to use
  * @return	string
  */
 function php_to_template_syntax($str, $engine = NULL)
@@ -265,10 +265,10 @@ function php_to_template_syntax($str, $engine = NULL)
 /**
  * Convert string to  templating syntax
  *
- * @param 	string 	string to evaluate
- * @param 	array 	variables to parse with string
- * @param 	string	the templating engine to use
- * @param 	array 	an array of configuration variables like compile_dir, delimiters, allowed_functions, refs and data
+ * @param	string	string to evaluate
+ * @param	array	variables to parse with string
+ * @param	string	the templating engine to use
+ * @param	array	an array of configuration variables like compile_dir, delimiters, allowed_functions, refs and data
  * @return	string
  */
 function parse_template_syntax($str, $vars = array(), $engine = NULL, $config = array())
diff --git a/fuel/modules/fuel/helpers/MY_url_helper.php b/fuel/modules/fuel/helpers/MY_url_helper.php
index 6c1141316..6ee649e86 100644
--- a/fuel/modules/fuel/helpers/MY_url_helper.php
+++ b/fuel/modules/fuel/helpers/MY_url_helper.php
@@ -129,7 +129,7 @@ function current_url($show_query_str = FALSE, $lang = NULL)
 	 *
 	 * @access	public
 	 * @param	boolean	use the rerouted URI string?
-	 * @param	int	    the start index to build the uri path
+	 * @param	int		the start index to build the uri path
 	 * @param	boolean	determines whether to strip any language segments
 	 * @return	string
 	 */
@@ -168,7 +168,7 @@ function uri_path($rerouted = TRUE, $start_index = 0, $strip_lang = TRUE)
 	 * Returns the uri segment
 	 *
 	 * @access	public
-	 * @param	int	the segment number
+	 * @param	int		the segment number
 	 * @param	string	the default value if the segment doesn't exist
 	 * @param	boolean	whether to use the rerouted uri
 	 * @param	boolean	determines whether to strip any language segments
@@ -222,7 +222,7 @@ function is_http_path($path)
 	 * Determines if the page is the homepage or not
 	 *
 	 * @access	public
-	 * @param   string
+	 * @param	string
 	 * @return	boolean
 	 */
 	function is_home($uri_path = NULL)
@@ -382,8 +382,8 @@ function redirect_404($redirect = TRUE)
 	 * @param	string	the URL
 	 * @param	string	the method: location or redirect
 	 * @param	int		the http response code
-	 * @param	string	wether to force or not https
-	 * @param	boolean	wether add the language to the URI
+	 * @param	string	whether to force or not https
+	 * @param	boolean	whether add the language to the URI
 	 * @return	string
 	 */
 	function redirect($uri = '', $method = 'location', $http_response_code = 302, $https = NULL,  $language = FALSE)
diff --git a/fuel/modules/fuel/helpers/asset_helper.php b/fuel/modules/fuel/helpers/asset_helper.php
index 725059158..ded9a96dc 100644
--- a/fuel/modules/fuel/helpers/asset_helper.php
+++ b/fuel/modules/fuel/helpers/asset_helper.php
@@ -258,10 +258,10 @@ function assets_server_path($file = NULL, $path = NULL, $module = NULL)
 	/**
 	 * Convert a server path to a web path
 	 *
-	 * @access  public
-	 * @param   string  server path to asset file
-	 * @param   bool    truncate to asset folder
-	 * @return  string
+	 * @access	public
+	 * @param	string	server path to asset file
+	 * @param	bool	truncate to asset folder
+	 * @return	string
 	 */
 	function assets_server_to_web_path($file, $truncate_to_asset_folder = FALSE)
 	{
diff --git a/fuel/modules/fuel/helpers/browser_helper.php b/fuel/modules/fuel/helpers/browser_helper.php
index fd8477646..4f3b343bb 100644
--- a/fuel/modules/fuel/helpers/browser_helper.php
+++ b/fuel/modules/fuel/helpers/browser_helper.php
@@ -35,7 +35,7 @@
 	 * Originally from: http://us3.php.net/function.get-browser
 	 *
 	 * @access	public
-	 * @param	string	browser agant (optional)
+	 * @param	string	browser agent (optional)
 	 * @return	array
 	 */
 	function browser_info($agent = NULL)
diff --git a/fuel/modules/fuel/helpers/convert_helper.php b/fuel/modules/fuel/helpers/convert_helper.php
index 632dfea69..9eb2d080b 100644
--- a/fuel/modules/fuel/helpers/convert_helper.php
+++ b/fuel/modules/fuel/helpers/convert_helper.php
@@ -128,7 +128,7 @@ function uri_safe_decode($str, $hexify = TRUE)
 	 *
 	 * @access	public
 	 * @param	string	string to be converted
-	 * @param   string  delimiter to join values with
+	 * @param	string	delimiter to join values with
 	 * @param	boolean	value is hexified
 	 * @return	string
 	 */
diff --git a/fuel/modules/fuel/helpers/format_helper.php b/fuel/modules/fuel/helpers/format_helper.php
index 06a42871c..e55621bfb 100644
--- a/fuel/modules/fuel/helpers/format_helper.php
+++ b/fuel/modules/fuel/helpers/format_helper.php
@@ -34,11 +34,11 @@
 	 * Formats value into a currency string
 	 *
 	 * @access	public
-	 * @param	string  value to format
-	 * @param   string  currency symbol
+	 * @param	string	value to format
+	 * @param	string	currency symbol
 	 * @param	bool	whether to include the cents or not
-	 * @param   string  decimal separator
-	 * @param   string  thousands separator
+	 * @param	string	decimal separator
+	 * @param	string	thousands separator
 	 * @return	string
 	 */
 	function currency($value, $symbol = '$',  $include_cents = TRUE, $decimal_sep = '.', $thousands_sep = ',')
diff --git a/fuel/modules/fuel/helpers/google_helper.php b/fuel/modules/fuel/helpers/google_helper.php
index 66a52b6b3..1b43c3d01 100644
--- a/fuel/modules/fuel/helpers/google_helper.php
+++ b/fuel/modules/fuel/helpers/google_helper.php
@@ -38,11 +38,11 @@
 	* Otherwise, it will use the value defined in the google.php config file
 	* If both values do not exist, nothing will be inserted.
 	*
-	* @access   public
-	* @param    string	The google account number (optional)
-	* @param    mixed	An array or string of extra parameters to pass to GA. An array will use the key/value to add _gaq.push (optional)
-	* @param    boolean	Whether to check dev mode before adding it in (optional)
-	* @return   string
+	* @access	public
+	* @param	string	The google account number (optional)
+	* @param	mixed	An array or string of extra parameters to pass to GA. An array will use the key/value to add _gaq.push (optional)
+	* @param	boolean	Whether to check dev mode before adding it in (optional)
+	* @return	string
 	*/
 	function google_uanalytics($uacct = '', $other_params = array(), $check_devmode = TRUE) {
 
@@ -115,11 +115,11 @@ function google_uanalytics($uacct = '', $other_params = array(), $check_devmode
 	* Otherwise, it will use the value defined in the google.php config file
 	* If both values do not exist, nothing will be inserted.
 	*
-	* @access   public
-	* @param    string	The google account number (optional)
-	* @param    mixed	An array or string of extra parameters to pass to GA. An array will use the key/value to add _gaq.push (optional)
-	* @param    boolean	Whether to check dev mode before adding it in (optional)
-	* @return   string
+	* @access	public
+	* @param	string	The google account number (optional)
+	* @param	mixed	An array or string of extra parameters to pass to GA. An array will use the key/value to add _gaq.push (optional)
+	* @param	boolean	Whether to check dev mode before adding it in (optional)
+	* @return	string
 	*/
 	function google_analytics($uacct = '', $other_params = array(), $check_devmode = TRUE) {
 		/*
@@ -193,10 +193,10 @@ function google_analytics($uacct = '', $other_params = array(), $check_devmode =
 	*
 	* Returns an iframed Google map
 	*
-	* @access   public
-	* @param    mixed	address can be either an array with "address", "city", "state" or simply a string
-	* @param    array	additional map parameters that include "height", "width", hl" (language), "z" (zoom), "t" (map type), "om", (overview map), "iwloc" (display info bubble), "ll" (lat,lng). Friendly names of "display_info" (iwloc), "map_type" (t), and "overview" (om) can be used. (optional)
-	* @return   string
+	* @access	public
+	* @param	mixed	address can be either an array with "address", "city", "state" or simply a string
+	* @param	array	additional map parameters that include "height", "width", hl" (language), "z" (zoom), "t" (map type), "om", (overview map), "iwloc" (display info bubble), "ll" (lat,lng). Friendly names of "display_info" (iwloc), "map_type" (t), and "overview" (om) can be used. (optional)
+	* @return	string
 	*/
 	function google_map($address, $params = array())
 	{
@@ -226,10 +226,10 @@ function google_map($address, $params = array())
 	*
 	* Returns a google map URL (used by the google_map function too)
 	*
-	* @access   public
-	* @param    mixed	address can be either an array with "address", "city", "state" or simply a string. You can also pass lat and lng values as an array
-	* @param    array	additional map parameters that include "hl" (language), "z" (zoom), "t" (map type), "om", (overview map), "iwloc" (display info bubble), "ll" (lat,lng). Friendly names of "display_info" (iwloc), "map_type" (t), and "overview" (om) can be used. (optional)
-	* @return   string
+	* @access	public
+	* @param	mixed	address can be either an array with "address", "city", "state" or simply a string. You can also pass lat and lng values as an array
+	* @param	array	additional map parameters that include "hl" (language), "z" (zoom), "t" (map type), "om", (overview map), "iwloc" (display info bubble), "ll" (lat,lng). Friendly names of "display_info" (iwloc), "map_type" (t), and "overview" (om) can be used. (optional)
+	* @return	string
 	*/
 	function google_map_url($address, $params = array())
 	{
@@ -342,11 +342,11 @@ function google_map_url($address, $params = array())
 	* Use sleep() or usleep() functions to meter multiple requests (10/s is limit I believe)
 	* More on the return types here: https://developers.google.com/maps/documentation/geocoding/
 	*
-	* @access   public
-	* @param    mixed	address can be either an array with "address", "city", "state" or simply a string
-	* @param    mixed	return type can be 'all' (default), 'address_components', 'formatted_address', 'geometry', 'location', 'street_number', 'route', 'neighborhood', 'city',  'county', 'state', 'country', 'zip' (optional)
-	* @param    bool    whether to return value under 'short_name' or 'long_name' if defined in result
-	* @return   mixed   usually an array (e.g. array('latitude' => xxxx, 'longitude' => xxxx))
+	* @access	public
+	* @param	mixed	address can be either an array with "address", "city", "state" or simply a string
+	* @param	mixed	return type can be 'all' (default), 'address_components', 'formatted_address', 'geometry', 'location', 'street_number', 'route', 'neighborhood', 'city',  'county', 'state', 'country', 'zip' (optional)
+	* @param	bool	whether to return value under 'short_name' or 'long_name' if defined in result
+	* @return	mixed	usually an array (e.g. array('latitude' => xxxx, 'longitude' => xxxx))
 	*/
 	function google_geolocate($data, $return = 'all', $long = TRUE)
 	{
diff --git a/fuel/modules/fuel/helpers/session_helper.php b/fuel/modules/fuel/helpers/session_helper.php
index e8009360b..7b6e101f6 100644
--- a/fuel/modules/fuel/helpers/session_helper.php
+++ b/fuel/modules/fuel/helpers/session_helper.php
@@ -102,7 +102,7 @@ function session_flashdata($key)
 	 *
 	 * @access	public
 	 * @param	string	variable name
-	 * @param   string  value
+	 * @param	string	value
 	 * @return	boolean
 	 */
 	function session_set_flashdata($key, $value)
diff --git a/fuel/modules/fuel/helpers/utility_helper.php b/fuel/modules/fuel/helpers/utility_helper.php
index 81081aa70..41b5e0fb6 100644
--- a/fuel/modules/fuel/helpers/utility_helper.php
+++ b/fuel/modules/fuel/helpers/utility_helper.php
@@ -34,7 +34,7 @@
 /**
  * Returns the global CI object
  *
- * @return 	object
+ * @return	object
  */
 if (!function_exists('CI'))
 {
@@ -55,7 +55,7 @@ function CI() {
 	 *
 	 * @param	boolean	turn on output buffering
 	 * @param	string	if set to 'all', will clear end the buffer and clean it
-	 * @return 	string	return buffered content
+	 * @return	string	return buffered content
 	 */
 	function capture($on = TRUE, $clean = 'all')
 	{
@@ -91,7 +91,7 @@ function capture($on = TRUE, $clean = 'all')
 	 * Format true value
 	 *
 	 * @param	mixed	possible true value
-	 * @return 	string	formatted true value
+	 * @return	string	formatted true value
 	 */
 	function is_true_val($val)
 	{
@@ -108,7 +108,7 @@ function is_true_val($val)
 	 * Boolean check to determine string content is serialized
 	 *
 	 * @param	mixed	possible serialized string
-	 * @return 	boolean
+	 * @return	boolean
 	 */
 	function is_serialized_str($data)
 	{
@@ -145,7 +145,7 @@ function is_serialized_str($data)
 	 * Boolean check to determine string content is a JSON object string
 	 *
 	 * @param	mixed	possible serialized string
-	 * @return 	boolean
+	 * @return	boolean
 	 */
 	function is_json_str($data)
 	{
@@ -167,7 +167,7 @@ function is_json_str($data)
 	 *
 	 * @param	mixed	The variable to dump
 	 * @param	boolean	Return string
-	 * @return 	string
+	 * @return	string
 	 */
 	function print_obj($obj, $return = FALSE)
 	{
@@ -213,7 +213,7 @@ function print_obj($obj, $return = FALSE)
 	 * Logs an error message to logs file
 	 *
 	 * @param	string	Error message
-	 * @return 	void
+	 * @return	void
 	 */
 	function log_error($error) 
 	{
@@ -228,7 +228,7 @@ function log_error($error)
 	/**
 	 * Returns whether the current environment is set for development
 	 *
-	 * @return 	boolean
+	 * @return	boolean
 	 */
 	function is_dev_mode()
 	{
@@ -243,9 +243,9 @@ function is_dev_mode()
 	/**
 	 * Returns whether the current environment is equal to the passed environment
 	 *
-	 * @access  public
-	 * @param   string   environment to test
-	 * @return 	boolean
+	 * @access	public
+	 * @param	string	environment to test
+	 * @return	boolean
 	 */
 	function is_environment($environment)
 	{
diff --git a/fuel/modules/fuel/helpers/validator_helper.php b/fuel/modules/fuel/helpers/validator_helper.php
index bc78746d6..8f3343c00 100644
--- a/fuel/modules/fuel/helpers/validator_helper.php
+++ b/fuel/modules/fuel/helpers/validator_helper.php
@@ -142,7 +142,7 @@ function valid_email($email)
 	 *
 	 * @access	public
 	 * @param	int		integer of any length
-	 * @param 	int		integer of any length to test against
+	 * @param	int		integer of any length to test against
 	 * @return	boolean
 	 */
 	function min_num($var, $limit = 1)
@@ -164,7 +164,7 @@ function min_num($var, $limit = 1)
 	 *
 	 * @access	public
 	 * @param	int		integer of any length
-	 * @param 	int		integer of any length to test against
+	 * @param	int		integer of any length to test against
 	 * @return	boolean
 	 */
 	function max_num($var, $limit = 1)
@@ -186,8 +186,8 @@ function max_num($var, $limit = 1)
 	 *
 	 * @access	public
 	 * @param	int		integer of any length
-	 * @param 	int		integer of any length to test low
-	 * @param 	int		integer of any length to test high
+	 * @param	int		integer of any length to test low
+	 * @param	int		integer of any length to test high
 	 * @return	boolean
 	 */
 	function is_between($var, $lo, $hi)
@@ -209,8 +209,8 @@ function is_between($var, $lo, $hi)
 	 *
 	 * @access	public
 	 * @param	int		integer of any length
-	 * @param 	int		integer of any length to test low
-	 * @param 	int		integer of any length to test high
+	 * @param	int		integer of any length to test low
+	 * @param	int		integer of any length to test high
 	 * @return	boolean
 	 */
 	function is_outside($var, $lo, $hi)
@@ -232,7 +232,7 @@ function is_outside($var, $lo, $hi)
 	 *
 	 * @access	public
 	 * @param	string	string of any length
-	 * @param 	int		integer to test string length against
+	 * @param	int		integer to test string length against
 	 * @return	boolean
 	 */
 	function length_max($str, $limit = 1000)
@@ -257,7 +257,7 @@ function length_max($str, $limit = 1000)
 	 *
 	 * @access	public
 	 * @param	string	string of any length
-	 * @param 	int		integer to test string length against
+	 * @param	int		integer to test string length against
 	 * @return	boolean
 	 */
 	function length_min($str, $limit = 1)
@@ -798,7 +798,7 @@ function displayErrors".$GLOBALS['__ERRORS_JS__']."() {
 	 * Display user-defined errors via javascript and html
 	 *
 	 * @access	public
-	 * @param	string  css class to define error styling
+	 * @param	string	css class to define error styling
 	 * @param	mixed	collection of errors created by user
 	 * @return	string
 	 */
@@ -876,8 +876,8 @@ function has_errors()
 	 * Add a user-defined error message
 	 *
 	 * @access	public
-	 * @param	string error message
-	 * @param	string key value for error message array
+	 * @param	string	error message
+	 * @param	string	key value for error message array
 	 * @return	void
 	 */
 	function add_error($msg, $key = NULL)
@@ -901,8 +901,8 @@ function add_error($msg, $key = NULL)
 	 * Add a user-defined error message
 	 *
 	 * @access	public
-	 * @param	string error message
-	 * @param	string key value for error message array
+	 * @param	string	error message
+	 * @param	string	key value for error message array
 	 * @return	void
 	 */
 	function add_errors($errors)
@@ -923,7 +923,7 @@ function add_errors($errors)
 	 * Get a user-defined error message
 	 *
 	 * @access	public
-	 * @param	string key value for error message array
+	 * @param	string	key value for error message array
 	 * @return	string
 	 */
 	function get_error($key = null)

From 75cebdeeb5c4665481d397913cfa9728fa2f0b86 Mon Sep 17 00:00:00 2001
From: David McReynolds <dave@thedaylightstudio.com>
Date: Sat, 17 Mar 2018 22:16:03 -0700
Subject: [PATCH 013/129] Fixed missing bracket from previous commit

---
 fuel/modules/fuel/models/Fuel_pages_model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fuel/modules/fuel/models/Fuel_pages_model.php b/fuel/modules/fuel/models/Fuel_pages_model.php
index f459fe705..9d81c13e1 100644
--- a/fuel/modules/fuel/models/Fuel_pages_model.php
+++ b/fuel/modules/fuel/models/Fuel_pages_model.php
@@ -230,7 +230,7 @@ public function find_by_location($location, $just_published = 'yes')
 		$data = $this->find_one_array($where, 'location desc');
 
 		// case sensitive check
-		if (empty($data) OR ($data['location'] != $location AND (!empty($wildcard_location) AND $data['location'] != $wildcard_location.'/:any'))
+		if (empty($data) OR ($data['location'] != $location AND (!empty($wildcard_location) AND $data['location'] != $wildcard_location.'/:any')))
 		{
 			return array();
 		}

From 50f0f59bdf999c6908259187f15624589c8c5b55 Mon Sep 17 00:00:00 2001
From: David McReynolds <dave@thedaylightstudio.com>
Date: Sat, 17 Mar 2018 22:29:39 -0700
Subject: [PATCH 014/129] Fix per issue #444

---
 fuel/modules/fuel/libraries/Fuel_custom_fields.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fuel/modules/fuel/libraries/Fuel_custom_fields.php b/fuel/modules/fuel/libraries/Fuel_custom_fields.php
index a3f3c85ca..34c49efe6 100644
--- a/fuel/modules/fuel/libraries/Fuel_custom_fields.php
+++ b/fuel/modules/fuel/libraries/Fuel_custom_fields.php
@@ -1645,7 +1645,7 @@ public function multi($params)
 
 				if (!empty($inline_class))
 				{
-					'</span>';
+					$str .= '</span>';
 				}
 
 			}
@@ -1674,7 +1674,7 @@ public function multi($params)
 		$exists_params['ignore_representative'] = TRUE;
 		$str .= $form_builder->create_field($exists_params);
 
-		return $str;
+		return $str;$str .= 
 	}
 
 	// --------------------------------------------------------------------

From d455f95e983131588a6a1d93e8500bae0e646034 Mon Sep 17 00:00:00 2001
From: David McReynolds <dave@thedaylightstudio.com>
Date: Sun, 18 Mar 2018 09:57:12 -0700
Subject: [PATCH 015/129] Fix for previous commit.

---
 fuel/modules/fuel/libraries/Fuel_custom_fields.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fuel/modules/fuel/libraries/Fuel_custom_fields.php b/fuel/modules/fuel/libraries/Fuel_custom_fields.php
index 34c49efe6..5cbeedd02 100644
--- a/fuel/modules/fuel/libraries/Fuel_custom_fields.php
+++ b/fuel/modules/fuel/libraries/Fuel_custom_fields.php
@@ -1674,7 +1674,7 @@ public function multi($params)
 		$exists_params['ignore_representative'] = TRUE;
 		$str .= $form_builder->create_field($exists_params);
 
-		return $str;$str .= 
+		return $str;
 	}
 
 	// --------------------------------------------------------------------

From 4ad8813ace641f8ed18c422f125c15fa2dc2b09d Mon Sep 17 00:00:00 2001
From: Martynas Sateika <martynas.sateika@gmail.com>
Date: Sun, 18 Mar 2018 17:13:05 +0000
Subject: [PATCH 016/129] Add 'function_exist' checks to fuel_helper

---
 fuel/modules/fuel/helpers/fuel_helper.php | 1106 +++++++++++----------
 1 file changed, 582 insertions(+), 524 deletions(-)

diff --git a/fuel/modules/fuel/helpers/fuel_helper.php b/fuel/modules/fuel/helpers/fuel_helper.php
index 648a27d3d..1f068d2eb 100755
--- a/fuel/modules/fuel/helpers/fuel_helper.php
+++ b/fuel/modules/fuel/helpers/fuel_helper.php
@@ -55,679 +55,737 @@ function &FUEL()
 
 // --------------------------------------------------------------------
 
-/**
- * Allows you to load a view and pass data to it.
- *
- * The <dfn>params</dfn> parameter can either be string value (in which case it will assume it is the name of the block view file) or an associative array that can have the following values:
-
-<ul>
-	<li><strong>view</strong> - the name of the view block file. Also can be the first parameter of the method</li>
-	<li><strong>vars</strong>: an array of variables to pass to the block. Also can be the second parameter of the method.</li>
-	<li><strong>view_string</strong> - a string variable that represents the block</li>
-	<li><strong>model</strong> - the name of a model to automatically load for the block</li>
-	<li><strong>find</strong> - the name of the find method to run on the loaded model</li>
-	<li><strong>select</strong> - select parameters to run for the find method</li>
-	<li><strong>where</strong> - where parameters to run for the find method</li>
-	<li><strong>order</strong> - the order the find method should return</li>
-	<li><strong>limit</strong> - the limit number of results to be returned by the find method</li>
-	<li><strong>offset</strong> - the find results returned offset value</li>
-	<li><strong>return_method</strong>: the return method the find query should use</li>
-	<li><strong>assoc_key</strong>: the column name to be used as the associative key in the find method</li>
-	<li><strong>data</strong>: the data values to be passed to the block. This variable get's automatically set if you specify the model and find method</li>
-	<li><strong>editable</strong>: css class styles to apply to menu items... can be a nested array</li>
-	<li><strong>parse</strong>: determines whether to parse the contents of the block. The default is set to 'auto'</li>
-	<li><strong>cache</strong>: determines whether to cache the block. Default is false</li>
-	<li><strong>mode</strong>: explicitly will look in either the CMS or the views/_blocks folder</li>
-	<li><strong>module</strong>: the name of the module to look in for the block</li>
-	<li><strong>language</strong>: the language version to use for the block. Must be a value specified found in the 'languages' options in the FUEL configuration</li>
-	<li><strong>use_default</strong>: determines whether to find a non-language specified version of a block with the same name if the specified language version is not available in the CMS</li>
-</ul>
- *
- * @access	public
- * @param	array
- * @param	array
- * @param	boolean
- * @param	string
- * @return	string
- */
-function fuel_block($params, $vars = array(), $check_db = TRUE, $scope = NULL)
+if ( ! function_exists('fuel_block'))
 {
-	$CI =& get_instance();
-	return $CI->fuel->blocks->render($params, $vars, $check_db, $scope);
+	/**
+	 * Allows you to load a view and pass data to it.
+	 *
+	 * The <dfn>params</dfn> parameter can either be string value (in which case it will assume it is the name of the block view file) or an associative array that can have the following values:
+	 *
+	 * <ul>
+	 * <li><strong>view</strong> - the name of the view block file. Also can be the first parameter of the method</li>
+	 * <li><strong>vars</strong>: an array of variables to pass to the block. Also can be the second parameter of the method.</li>
+	 * <li><strong>view_string</strong> - a string variable that represents the block</li>
+	 * <li><strong>model</strong> - the name of a model to automatically load for the block</li>
+	 * <li><strong>find</strong> - the name of the find method to run on the loaded model</li>
+	 * <li><strong>select</strong> - select parameters to run for the find method</li>
+	 * <li><strong>where</strong> - where parameters to run for the find method</li>
+	 * <li><strong>order</strong> - the order the find method should return</li>
+	 * <li><strong>limit</strong> - the limit number of results to be returned by the find method</li>
+	 * <li><strong>offset</strong> - the find results returned offset value</li>
+	 * <li><strong>return_method</strong>: the return method the find query should use</li>
+	 * <li><strong>assoc_key</strong>: the column name to be used as the associative key in the find method</li>
+	 * <li><strong>data</strong>: the data values to be passed to the block. This variable get's automatically set if you specify the model and find method</li>
+	 * <li><strong>editable</strong>: css class styles to apply to menu items... can be a nested array</li>
+	 * <li><strong>parse</strong>: determines whether to parse the contents of the block. The default is set to 'auto'</li>
+	 * <li><strong>cache</strong>: determines whether to cache the block. Default is false</li>
+	 * <li><strong>mode</strong>: explicitly will look in either the CMS or the views/_blocks folder</li>
+	 * <li><strong>module</strong>: the name of the module to look in for the block</li>
+	 * <li><strong>language</strong>: the language version to use for the block. Must be a value specified found in the 'languages' options in the FUEL configuration</li>
+	 * <li><strong>use_default</strong>: determines whether to find a non-language specified version of a block with the same name if the specified language version is not available in the CMS</li>
+	 * </ul>
+	 *
+	 * @access	public
+	 * @param	array
+	 * @param	array
+	 * @param	boolean
+	 * @param	string
+	 * @return	string
+	 */
+	function fuel_block($params, $vars = array(), $check_db = TRUE, $scope = NULL)
+	{
+		$CI =& get_instance();
+		return $CI->fuel->blocks->render($params, $vars, $check_db, $scope);
+	}
 }
 
 // --------------------------------------------------------------------
 
-/**
- * Creates a menu structure
- * 
- * The <dfn>params</dfn> parameter is an array of options to be used with the <a href="[user_guide_url]libraries/menu">Menu class</a>.
- * If FUEL's configuration mode is set to either <dfn>auto</dfn> or <dfn>cms</dfn>, then it will first look for data from the FUEL navigation module. 
- * Otherwise it will by default look for the file <dfn>views/_variables/nav.php</dfn> (you can change the name of the file it looks for in the <dfn>file</dfn> parameter passed). That file should contain an array of menu information (see <a href="<?=user_guide_url('libraries/menu')?>">Menu class</a> for more information on the required data structure). 
- * The parameter values are very similar to the <a href="[user_guide_url]libraries/menu">Menu class</a>, with a few additions shown below:
-
-<ul>
-		<li><strong>items</strong> - the navigation items to use. By default, this is empty and will look for the nav.php file or the records in the Navigation module</li>
-		<li><strong>file</strong> - the name of the file containing the navigation information</li>
-		<li><strong>var</strong> - the variable name in the file to use</li>
-		<li><strong>parent</strong> - the parent id you would like to start rendering from. This is either the database ID or the nav array key of the menu item</li>
-		<li><strong>root</strong> - the equivalent to the root_value attribute in the Menu class. It states what the root value of the menu structure should be. Normally you don't need to worry about this</li>
-		<li><strong>group_id</strong> - the group ID in the database to use. The default is <dfn>1</dfn>. Only applies to navigation items saved in the admin</li>
-		<li><strong>exclude</strong> - nav items to exclude from the menu. Can be an array or a regular expression string</li>
-		<li><strong>return_normalized</strong> - returns the raw normalized array that gets used to generate the menu</li>
-		<li><strong>render_type</strong>: options are basic, breadcrumb, page_title, collapsible, delimited, array. Default is 'basic'</li>
-		<li><strong>active_class</strong>: the active css class. Default is 'active'</li>
-		<li><strong>active</strong>: the active menu item</li>
-		<li><strong>styles</strong>: css class styles to apply to menu items... can be a nested array</li>
-		<li><strong>first_class</strong>: the css class for the first menu item. Default is first</li>
-		<li><strong>last_class</strong>: the css class for the last menu item. Default is last</li>
-		<li><strong>depth</strong>: the depth of the menu to render at</li>
-		<li><strong>use_titles</strong>: use the title attribute in the links. Default is FALSE</li>
-		<li><strong>container_tag</strong>: the html tag for the container of a set of menu items. Default is ul</li>
-		<li><strong>container_tag_attrs</strong>: html attributes for the container tag</li>
-		<li><strong>container_tag_id</strong>: html container id</li>
-		<li><strong>container_tag_class</strong>: html container class</li>
-		<li><strong>subcontainer_tag_class</strong>: an array of css classes to apply to subcontainers</li>
-		<li><strong>cascade_selected</strong>: cascade the selected items. Default is TRUE</li>
-		<li><strong>include_hidden</strong>: include menu items with the hidden attribute. Default is FALSE</li>
-		<li><strong>item_tag</strong>: the html list item element. Default is 'li'</li>
-		<li><strong>item_id_prefix</strong>: the prefix to the item id</li>
-		<li><strong>item_id_key</strong>: either id or location. Default is 'id'</li>
-		<li><strong>use_nav_key</strong>: determines whether to use the nav_key or the location for the active state. Default is "AUTO"</li>
-		<li><strong>pre_render_func</strong>: function to apply to menu labels before rendering</li>
-		<li><strong>delimiter</strong>: the html element between the links </li>
-		<li><strong>arrow_class</strong>: the class for the arrows used in breadcrumb type menus</li>
-		<li><strong>display_current</strong>: determines whether to display the current active breadcrumb item</li>
-		<li><strong>home_link</strong>: the root home link</li>
-		<li><strong>append</strong>: appends additional menu items to those items already set (e.g. from the $nav array or from the navigation module). Good to use on dynamic pages where you need to dynamically set a navigation item for a page</li>
-		<li><strong>order</strong>: the order to display... for page_title ONLY</li>
-		<li><strong>language</strong>: select the appropriate language</li>
-		<li><strong>include_default_language</strong>: will merge in the default language with the results. Default is FALSE</li>
-		<li><strong>language_default_group</strong>: the default group to be used when including a default language. Default is FALSE</li>
-	</ul>
-
-<p class="important">For more information see the <a href="<?=user_guide_url('libraries/menu')?>">Menu class</a>.</p>
- *
- * @access	public
- * @param	array
- * @return	string
- */
-function fuel_nav($params = array())
+if ( ! function_exists('fuel_nav'))
 {
-	$CI =& get_instance();
-	return $CI->fuel->navigation->render($params);
+	/**
+	 * Creates a menu structure
+	 *
+	 * The <dfn>params</dfn> parameter is an array of options to be used with the <a href="[user_guide_url]libraries/menu">Menu class</a>.
+	 * If FUEL's configuration mode is set to either <dfn>auto</dfn> or <dfn>cms</dfn>, then it will first look for data from the FUEL navigation module.
+	 * Otherwise it will by default look for the file <dfn>views/_variables/nav.php</dfn> (you can change the name of the file it looks for in the <dfn>file</dfn> parameter passed). That file should contain an array of menu information (see <a href="<?=user_guide_url('libraries/menu')?>">Menu class</a> for more information on the required data structure).
+	 * The parameter values are very similar to the <a href="[user_guide_url]libraries/menu">Menu class</a>, with a few additions shown below:
+	 *
+	 * <ul>
+	 * <li><strong>items</strong> - the navigation items to use. By default, this is empty and will look for the nav.php file or the records in the Navigation module</li>
+	 * <li><strong>file</strong> - the name of the file containing the navigation information</li>
+	 * <li><strong>var</strong> - the variable name in the file to use</li>
+	 * <li><strong>parent</strong> - the parent id you would like to start rendering from. This is either the database ID or the nav array key of the menu item</li>
+	 * <li><strong>root</strong> - the equivalent to the root_value attribute in the Menu class. It states what the root value of the menu structure should be. Normally you don't need to worry about this</li>
+	 * <li><strong>group_id</strong> - the group ID in the database to use. The default is <dfn>1</dfn>. Only applies to navigation items saved in the admin</li>
+	 * <li><strong>exclude</strong> - nav items to exclude from the menu. Can be an array or a regular expression string</li>
+	 * <li><strong>return_normalized</strong> - returns the raw normalized array that gets used to generate the menu</li>
+	 * <li><strong>render_type</strong>: options are basic, breadcrumb, page_title, collapsible, delimited, array. Default is 'basic'</li>
+	 * <li><strong>active_class</strong>: the active css class. Default is 'active'</li>
+	 * <li><strong>active</strong>: the active menu item</li>
+	 * <li><strong>styles</strong>: css class styles to apply to menu items... can be a nested array</li>
+	 * <li><strong>first_class</strong>: the css class for the first menu item. Default is first</li>
+	 * <li><strong>last_class</strong>: the css class for the last menu item. Default is last</li>
+	 * <li><strong>depth</strong>: the depth of the menu to render at</li>
+	 * <li><strong>use_titles</strong>: use the title attribute in the links. Default is FALSE</li>
+	 * <li><strong>container_tag</strong>: the html tag for the container of a set of menu items. Default is ul</li>
+	 * <li><strong>container_tag_attrs</strong>: html attributes for the container tag</li>
+	 * <li><strong>container_tag_id</strong>: html container id</li>
+	 * <li><strong>container_tag_class</strong>: html container class</li>
+	 * <li><strong>subcontainer_tag_class</strong>: an array of css classes to apply to subcontainers</li>
+	 * <li><strong>cascade_selected</strong>: cascade the selected items. Default is TRUE</li>
+	 * <li><strong>include_hidden</strong>: include menu items with the hidden attribute. Default is FALSE</li>
+	 * <li><strong>item_tag</strong>: the html list item element. Default is 'li'</li>
+	 * <li><strong>item_id_prefix</strong>: the prefix to the item id</li>
+	 * <li><strong>item_id_key</strong>: either id or location. Default is 'id'</li>
+	 * <li><strong>use_nav_key</strong>: determines whether to use the nav_key or the location for the active state. Default is "AUTO"</li>
+	 * <li><strong>pre_render_func</strong>: function to apply to menu labels before rendering</li>
+	 * <li><strong>delimiter</strong>: the html element between the links </li>
+	 * <li><strong>arrow_class</strong>: the class for the arrows used in breadcrumb type menus</li>
+	 * <li><strong>display_current</strong>: determines whether to display the current active breadcrumb item</li>
+	 * <li><strong>home_link</strong>: the root home link</li>
+	 * <li><strong>append</strong>: appends additional menu items to those items already set (e.g. from the $nav array or from the navigation module). Good to use on dynamic pages where you need to dynamically set a navigation item for a page</li>
+	 * <li><strong>order</strong>: the order to display... for page_title ONLY</li>
+	 * <li><strong>language</strong>: select the appropriate language</li>
+	 * <li><strong>include_default_language</strong>: will merge in the default language with the results. Default is FALSE</li>
+	 * <li><strong>language_default_group</strong>: the default group to be used when including a default language. Default is FALSE</li>
+	 * </ul>
+	 *
+	 * <p class="important">For more information see the <a href="<?=user_guide_url('libraries/menu')?>">Menu class</a>.</p>
+	 *
+	 * @access	public
+	 * @param	array	$params
+	 * @return	string
+	 */
+	function fuel_nav($params = array())
+	{
+		$CI =& get_instance();
+		return $CI->fuel->navigation->render($params);
+	}
 }
 
 // --------------------------------------------------------------------
 
-/**
- * Generates a page using the Fuel_page class
- *
- * @access	public
- * @param	array
- * @param	array
- * @return	string
- */
-function fuel_page($location, $vars = array(), $params = array())
+if ( ! function_exists('fuel_page'))
 {
-	$CI =& get_instance();
-	return $CI->fuel->pages->render($location, $vars, $params, TRUE);
+	/**
+	 * Generates a page using the Fuel_page class
+	 *
+	 * @access	public
+	 * @param	string
+	 * @param	array
+	 * @param	array
+	 * @return	string
+	 */
+	function fuel_page($location, $vars = array(), $params = array())
+	{
+		$CI =& get_instance();
+		return $CI->fuel->pages->render($location, $vars, $params, TRUE);
+	}
 }
 
 // --------------------------------------------------------------------
 
-/**
- * Creates a form using form builder
- *
- * @access	public
- * @param	mixed
- * @param	array
- * @param	array
- * @return	string
- */
-function fuel_form($fields, $values = array(), $params = array())
+if ( ! function_exists('fuel_form'))
 {
-	$CI =& get_instance();
-	
-	// if a string is provided instead of array, we will assume it is a model
-	if (is_string($fields))
+	/**
+	 * Creates a form using form builder
+	 *
+	 * @access	public
+	 * @param	mixed
+	 * @param	array
+	 * @param	array
+	 * @return	string
+	 */
+	function fuel_form($fields, $values = array(), $params = array())
 	{
-		$model = $fields;
-		if (substr($model, strlen($model) - 6) != '_model')
-		{
-			$model = $model.'_model';
-		}
-		$CI->load->model($model);
-		
-		// check if the model has a form_fields method on it first
-		if (!method_exists('form_fields', $CI->$model))
+		$CI =& get_instance();
+
+		// if a string is provided instead of array, we will assume it is a model
+		if (is_string($fields))
 		{
-			return '';
+			$model = $fields;
+			if (substr($model, strlen($model) - 6) != '_model')
+			{
+				$model = $model . '_model';
+			}
+			$CI->load->model($model);
+
+			// check if the model has a form_fields method on it first
+			if ( ! method_exists('form_fields', $CI->$model))
+			{
+				return '';
+			}
+			$fields = $CI->$model->form_fields();
 		}
-		$fields = $CI->$model->form_fields();
+		$CI->load->library('form_builder', $params);
+		$CI->form_builder->set_fields($fields);
+		$CI->form_builder->set_field_values($values);
+		return $CI->form_builder->render();
 	}
-	$CI->load->library('form_builder', $params);
-	$CI->form_builder->set_fields($fields);
-	$CI->form_builder->set_field_values($values);
-	return $CI->form_builder->render();
 }
 
 // --------------------------------------------------------------------
 
-/**
- * Loads a module model and creates a variable in the view that you can use to merge data. 
- *
- * The <dfn>params</dfn> parameter is an associative array that can have the following values:
- *
-<ul>
-	<li><strong>find</strong> - the find method to use on the module model. Options are "one", "key", "all" or any method name on the model that begins with "find_" (excluding "find_" from the value)</li>
-	<li><strong>select</strong> - the select condition to filter the results of the find query</li>
-	<li><strong>where</strong> - the where condition to be used in the find query</li>
-	<li><strong>order</strong> - order the data results and sort them </li>
-	<li><strong>limit</strong> - limit the number of data results returned</li>
-	<li><strong>offset</strong> - offset the data results</li>
-	<li><strong>return_method</strong> - the return method to use which can be an object or an array</li>
-	<li><strong>assoc_key</strong> - the field to be used as an associative key for the data results</li>
-	<li><strong>var</strong> - the variable name to assign the data returned from the module model query</li>
-	<li><strong>module</strong> - specifies the module folder name to find the model</li>
-</ul>
- * @access	public
- * @param	string
- * @param	mixed
- * @param	mixed
- * @return	mixed
- */
-function fuel_model($module, $params = array(), $where = array())
+if ( ! function_exists('fuel_model'))
 {
-	$CI =& get_instance();
-	$module = $CI->fuel->modules->get($module, FALSE);
-	if ($module)
+	/**
+	 * Loads a module model and creates a variable in the view that you can use to merge data.
+	 *
+	 * The <dfn>params</dfn> parameter is an associative array that can have the following values:
+	 *
+	 * <ul>
+	 * <li><strong>find</strong> - the find method to use on the module model. Options are "one", "key", "all" or any method name on the model that begins with "find_" (excluding "find_" from the value)</li>
+	 * <li><strong>select</strong> - the select condition to filter the results of the find query</li>
+	 * <li><strong>where</strong> - the where condition to be used in the find query</li>
+	 * <li><strong>order</strong> - order the data results and sort them </li>
+	 * <li><strong>limit</strong> - limit the number of data results returned</li>
+	 * <li><strong>offset</strong> - offset the data results</li>
+	 * <li><strong>return_method</strong> - the return method to use which can be an object or an array</li>
+	 * <li><strong>assoc_key</strong> - the field to be used as an associative key for the data results</li>
+	 * <li><strong>var</strong> - the variable name to assign the data returned from the module model query</li>
+	 * <li><strong>module</strong> - specifies the module folder name to find the model</li>
+	 * </ul>
+	 * @access	public
+	 * @param	string
+	 * @param	mixed
+	 * @param	mixed
+	 * @return	mixed
+	 */
+	function fuel_model($module, $params = array(), $where = array())
 	{
-		return $module->find($params, $where);
+		$CI =& get_instance();
+		$module = $CI->fuel->modules->get($module, FALSE);
+		if ($module)
+		{
+			return $module->find($params, $where);
+		}
+		return FALSE;
 	}
-	return FALSE;
 }
 
 // --------------------------------------------------------------------
 
-/**
- * Sets a variable for all views to use (including layouts) no matter what view it is declared in. 
- * 
- * Using fuel_set_var in a layout field in the admin, will have no affect (e.g. {fuel_set_var('layout', 'my_layout')}).
- *
- * @access	public
- * @param	string
- * @param	array
- * @return	void
- */
-function fuel_set_var($key, $val = NULL)
+if ( ! function_exists('fuel_set_var'))
 {
-	$CI =& get_instance();
-	if (strtoupper($CI->fuel->config('double_parse')) == 'AUTO')
+	/**
+	 * Sets a variable for all views to use (including layouts) no matter what view it is declared in.
+	 *
+	 * Using fuel_set_var in a layout field in the admin, will have no affect (e.g. {fuel_set_var('layout', 'my_layout')}).
+	 *
+	 * @access	public
+	 * @param	string
+	 * @param	array
+	 * @return	void
+	 */
+	function fuel_set_var($key, $val = NULL)
 	{
-		$CI->fuel->set_config('double_parse', TRUE);
-	}
+		$CI =& get_instance();
+		if (strtoupper($CI->fuel->config('double_parse')) == 'AUTO')
+		{
+			$CI->fuel->set_config('double_parse', TRUE);
+		}
 
-	if (is_array($key))
-	{
-		$CI->load->vars($key);
-	}
-	else if (is_string($key))
-	{
-		$vars[$key] = $val;
-		$CI->load->vars($vars);
+		if (is_array($key))
+		{
+			$CI->load->vars($key);
+		}
+		else if (is_string($key))
+		{
+			$vars[$key] = $val;
+			$CI->load->vars($vars);
+		}
 	}
 }
 
 // --------------------------------------------------------------------
 
-/**
- * Appends a value to an array variable for all views to use no matter what view it is declared in.
- *
-<code>
-	// EXAMPLE HEADER FILE
-	...
-	&lt;?php echo css(&#x27;main&#x27;); ?&gt;
-	&lt;?php echo css($css); ?&gt;
-
-	&lt;?php echo js(&#x27;jquery, main&#x27;); ?&gt;
-	&lt;?php echo js($js); ?&gt;
-	...
-
-	// Then in your view file
-	...
-	&lt;php
-	fuel_var_append('css', 'my_css_file.css');
-	fuel_var_append('js', 'my_js_file.js');
-	?&gt;
-	<h1>About our company</h1>
-	...
- </code>
- * @access	public
- * @param	string
- * @param	mixed
- * @return	void
- */
-function fuel_var_append($key, $value)
+if ( ! function_exists('fuel_var_append'))
 {
-	$CI =& get_instance();
-	$vars = $CI->load->get_vars();
-	if (isset($vars[$key]) AND is_array($vars[$key]))
+	/**
+	 * Appends a value to an array variable for all views to use no matter what view it is declared in.
+	 *
+	 * <code>
+	 * // EXAMPLE HEADER FILE
+	 * ...
+	 * &lt;?php echo css(&#x27;main&#x27;); ?&gt;
+	 * &lt;?php echo css($css); ?&gt;
+	 *
+	 * &lt;?php echo js(&#x27;jquery, main&#x27;); ?&gt;
+	 * &lt;?php echo js($js); ?&gt;
+	 * ...
+	 *
+	 * // Then in your view file
+	 * ...
+	 * &lt;php
+	 * fuel_var_append('css', 'my_css_file.css');
+	 * fuel_var_append('js', 'my_js_file.js');
+	 * ?&gt;
+	 * <h1>About our company</h1>
+	 * ...
+	 * </code>
+	 * @access	public
+	 * @param	string
+	 * @param	mixed
+	 * @return	void
+	 */
+	function fuel_var_append($key, $value)
 	{
-		if (is_array($value))
+		$CI =& get_instance();
+		$vars = $CI->load->get_vars();
+		if (isset($vars[$key]) AND is_array($vars[$key]))
 		{
-			$vars[$key] = array_merge($vars[$key], $value);
-		}
-		else
-		{
-			array_push($vars[$key], $value);
+			if (is_array($value))
+			{
+				$vars[$key] = array_merge($vars[$key], $value);
+			}
+			else
+			{
+				array_push($vars[$key], $value);
+			}
+			fuel_set_var($key, $vars[$key]);
 		}
-		fuel_set_var($key, $vars[$key]);
 	}
 }
 
 // --------------------------------------------------------------------
 
-/**
- * Returns a variable and allows for a default value.
- * Also creates inline editing marker.
- * The <dfn>default</dfn> parameter will be used if the variable does not exist.
- * The <dfn>edit_module</dfn> parameter specifies the module to include for inline editing.
- * The <dfn>evaluate</dfn> parameter specifies whether to evaluate any php in the variables.
- *
-<p class="important">You should not use this function inside of another function because you may get unexepected results. This is
-because it returns inline editing markers that later get parsed out by FUEL. For example:</p>
-
-<code>
-// NO
-&lt;a href="&lt;?=site_url(fuel_var('my_url'))?&gt;"&gt;my link&lt;/a&gt;
-
-// YES
-&lt;?=fuel_edit('my_url', 'Edit Link')?&gt; &lt;a href="&lt;?=site_url($my_url)?&gt;"&gt;my link&lt;/a&gt;
-</code>
-
- * @access	public
- * @param	string
- * @param	string
- * @param	boolean
- * @return	string
- */
-function fuel_var($key, $default = '', $edit_module = 'pagevariables', $evaluate = FALSE)
+if ( ! function_exists('fuel_var'))
 {
-	$CI =& get_instance();
-	$CI->load->helper('inflector');
+	/**
+	 * Returns a variable and allows for a default value.
+	 * Also creates inline editing marker.
+	 * The <dfn>default</dfn> parameter will be used if the variable does not exist.
+	 * The <dfn>edit_module</dfn> parameter specifies the module to include for inline editing.
+	 * The <dfn>evaluate</dfn> parameter specifies whether to evaluate any php in the variables.
+	 *
+	 * <p class="important">You should not use this function inside of another function because you may get unexepected results. This is
+	 * because it returns inline editing markers that later get parsed out by FUEL. For example:</p>
+	 *
+	 * <code>
+	 * // NO
+	 * &lt;a href="&lt;?=site_url(fuel_var('my_url'))?&gt;"&gt;my link&lt;/a&gt;
+	 *
+	 * // YES
+	 * &lt;?=fuel_edit('my_url', 'Edit Link')?&gt; &lt;a href="&lt;?=site_url($my_url)?&gt;"&gt;my link&lt;/a&gt;
+	 * </code>
+	 * @access	public
+	 * @param	string
+	 * @param	string
+	 * @param	string
+	 * @param	boolean
+	 * @return	string
+	 */
+	function fuel_var($key, $default = '', $edit_module = 'pagevariables', $evaluate = FALSE)
+	{
+		$CI =& get_instance();
+		$CI->load->helper('inflector');
 
-	$key_arr = explode('|', $key);
-	$key = $key_arr[0];
+		$key_arr = explode('|', $key);
+		$key = $key_arr[0];
 
-	if (isset($GLOBALS[$key]))
-	{
-		$val = $GLOBALS[$key];
-	}
-	else if ($CI->load->get_var($key))
-	{
-		$val = $CI->load->get_var($key);
-	}
-	else
-	{
-		$val = $default;
-	}
-	
-	if (is_string($val) AND $evaluate)
-	{
-		$val = eval_string($val);
-	}
-	else if (is_array($val) AND $evaluate)
-	{
-		if (isset($key_arr[1]))
+		if (isset($GLOBALS[$key]))
+		{
+			$val = $GLOBALS[$key];
+		}
+		else if ($CI->load->get_var($key))
+		{
+			$val = $CI->load->get_var($key);
+		}
+		else
+		{
+			$val = $default;
+		}
+
+		if (is_string($val) AND $evaluate)
 		{
-			if (isset($val[$key_arr[1]]))
+			$val = eval_string($val);
+		}
+		else if (is_array($val) AND $evaluate)
+		{
+			if (isset($key_arr[1]))
 			{
-				$val = $val[$key_arr[1]];
+				if (isset($val[$key_arr[1]]))
+				{
+					$val = $val[$key_arr[1]];
+				}
+				else
+				{
+					$val = $default;
+				}
 			}
 			else
 			{
-				$val = $default;
+				foreach ($val as $k => $v)
+				{
+					$val[$k] = eval_string($v);
+				}
 			}
 		}
+
+		if ($edit_module === TRUE) $edit_module = 'pagevariables';
+		if ( ! empty($edit_module) AND $CI->fuel->pages->mode() != 'views' AND ! defined('FUELIFY') OR (defined('FUELIFY') AND FUELIFY))
+		{
+			$marker = fuel_edit($key, humanize($key), $edit_module);
+		}
 		else
 		{
-			foreach($val as $k => $v)
-			{
-				$val[$k] = eval_string($v);
-			}
+			$marker = '';
 		}
-	}
-	
-	if ($edit_module === TRUE) $edit_module = 'pagevariables';
-	if (!empty($edit_module) AND $CI->fuel->pages->mode() != 'views' AND !defined('FUELIFY') OR (defined('FUELIFY') AND FUELIFY))
-	{
-		$marker = fuel_edit($key, humanize($key), $edit_module);
-	}
-	else
-	{
-		$marker = '';
-	}
-	
-	if (is_string($val))
-	{
-		return $marker.$val;
-	}
-	else
-	{
-		if (!empty($marker))
+
+		if (is_string($val))
 		{
-			// used to help with javascript positioning
-			$marker = '<span>'.$marker.'</span>';
+			return $marker . $val;
+		}
+		else
+		{
+			if ( ! empty($marker))
+			{
+				// used to help with javascript positioning
+				$marker = '<span>' . $marker . '</span>';
+			}
+			return $marker;
 		}
-		return $marker;
 	}
 }
 
 // --------------------------------------------------------------------
 
-/**
- * Sets a variable marker (pencil icon) in a page which can be used for inline editing.
- * 
- * The <dfn>id</dfn> parameter is the unique id that will be used to query the module. You can also pass an id value
- * and a field like so <dfn>id|field</dfn>. This will display only a certain field instead of the entire module form.
- * Alternatively, you can now also just pass the entire object and it will generate the id, label, module and published values automatically.
- * The <dfn>is_published</dfn> parameter specifies whether to indicate with the pencil icon that the item is active/published
- * The <dfn>label</dfn> parameter specifies the label to display next to the pencil icon.
- * The <dfn>xOffset</dfn> and <dfn>yOffset</dfn> are pixel values to offset the pencil icon.
- *
- * @access	public
- * @param	mixed
- * @param	string
- * @param	string
- * @param	boolean
- * @param	int
- * @param	int
- * @return	string
- */
-function fuel_edit($id, $label = NULL, $module = 'pagevariables', $is_published = TRUE, $xoffset = NULL, $yoffset = NULL)
+if ( ! function_exists('fuel_edit'))
 {
-	$CI =& get_instance();
-	$page = $CI->fuel->pages->active();
-	$permission = $module;
-	if (empty($page))
+	/**
+	 * Sets a variable marker (pencil icon) in a page which can be used for inline editing.
+	 *
+	 * The <dfn>id</dfn> parameter is the unique id that will be used to query the module. You can also pass an id value
+	 * and a field like so <dfn>id|field</dfn>. This will display only a certain field instead of the entire module form.
+	 * Alternatively, you can now also just pass the entire object and it will generate the id, label, module and published values automatically.
+	 * The <dfn>is_published</dfn> parameter specifies whether to indicate with the pencil icon that the item is active/published
+	 * The <dfn>label</dfn> parameter specifies the label to display next to the pencil icon.
+	 * The <dfn>xOffset</dfn> and <dfn>yOffset</dfn> are pixel values to offset the pencil icon.
+	 *
+	 * @access	public
+	 * @param	mixed
+	 * @param	string
+	 * @param	string
+	 * @param	boolean
+	 * @param	int
+	 * @param	int
+	 * @return	string
+	 */
+	function fuel_edit($id, $label = NULL, $module = 'pagevariables', $is_published = TRUE, $xoffset = NULL, $yoffset = NULL)
 	{
-		$page = $CI->fuel->pages->create();
-	}
-	if (!empty($id) AND (!defined('FUELIFY') OR defined('FUELIFY') AND FUELIFY !== FALSE))
-	{
-		if (is_object($id) AND is_a($id, 'Data_record') AND isset($id->id))
+		$CI =& get_instance();
+		$page = $CI->fuel->pages->active();
+		$permission = $module;
+		if (empty($page))
+		{
+			$page = $CI->fuel->pages->create();
+		}
+		if ( ! empty($id) AND ( ! defined('FUELIFY') OR defined('FUELIFY') AND FUELIFY !== FALSE))
 		{
-			$ref_id = $id->id;
-			
-			if (empty($module) OR $module == 'pagevariables')
+			if (is_object($id) AND is_a($id, 'Data_record') AND isset($id->id))
 			{
-				$module = $id->parent_model()->table_name();
-				$tables = array_flip($id->parent_model()->tables());
-				if (isset($tables[$module]))
+				$ref_id = $id->id;
+
+				if (empty($module) OR $module == 'pagevariables')
 				{
-					$module = $tables[$module];
+					$module = $id->parent_model()->table_name();
+					$tables = array_flip($id->parent_model()->tables());
+					if (isset($tables[$module]))
+					{
+						$module = $tables[$module];
+					}
+					unset($tables);
 				}
-				unset($tables);
-			}
-			
-			if (empty($label))
-			{
-				$label = lang('action_edit').': ';
 
-				if (isset($id->title))
+				if (empty($label))
 				{
-					$label .= $id->title;
+					$label = lang('action_edit') . ': ';
+
+					if (isset($id->title))
+					{
+						$label .= $id->title;
+					}
+					else if ($id->name)
+					{
+						$label .= $id->name;
+					}
 				}
-				else if ($id->name)
+
+				if (isset($id->published))
 				{
-					$label .= $id->name;
+					$is_published = is_true_val($id->published);
+				}
+				else if (isset($id->active))
+				{
+					$is_published = is_true_val($id->active);
 				}
 			}
-			
-			if (isset($id->published))
+			else
 			{
-				$is_published = is_true_val($id->published);
+				$ref_id = $id;
 			}
-			else if (isset($id->active))
+
+			$mod = $CI->fuel->modules->get($module, FALSE);
+			if ( ! empty($mod))
 			{
-				$is_published = is_true_val($id->active);
+				$module = $mod->info('module_uri');
+				$permission = $mod->info('permission');
 			}
-		}
-		else
-		{
-			$ref_id = $id;
-		}
 
-		$mod = $CI->fuel->modules->get($module, FALSE);
-		if (!empty($mod))
-		{
-			$module = $mod->info('module_uri');
-			$permission = $mod->info('permission');
+			$marker['id'] = $ref_id;
+			$marker['label'] = $label;
+			$marker['module'] = $module;
+			$marker['permission'] = $permission;
+			$marker['published'] = $is_published;
+			$marker['xoffset'] = $xoffset;
+			$marker['yoffset'] = $yoffset;
+
+			$key = $page->add_marker($marker);
+
+			return '<!--' . $key . '-->';
 		}
-		
-		$marker['id'] = $ref_id;
-		$marker['label'] = $label;
-		$marker['module'] = $module;
-		$marker['permission'] = $permission;
-		$marker['published'] = $is_published;
-		$marker['xoffset'] = $xoffset;
-		$marker['yoffset'] = $yoffset;
-
-		$key = $page->add_marker($marker);
-
-		return '<!--'.$key.'-->';
+		return '';
 	}
-	return '';
 }
 
 // --------------------------------------------------------------------
 
-/**
- * 	Creates the cache ID for the fuel page based on the URI. 
- * 
- * If no <dfn>location</dfn> value is passed, it will default to the current <a href="<?=user_guide_url('my_url_helper')?>">uri_path</a>.
- *
- * @access	public
- * @param	string
- * @return	string
- */
-function fuel_cache_id($location = NULL)
+if ( ! function_exists('fuel_cache_id'))
 {
-	$CI =& get_instance();
-	return $CI->fuel->cache->create_id($location);
+	/**
+	 * Creates the cache ID for the fuel page based on the URI.
+	 *
+	 * If no <dfn>location</dfn> value is passed, it will default to the current <a href="<?=user_guide_url('my_url_helper')?>">uri_path</a>.
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	string
+	 */
+	function fuel_cache_id($location = NULL)
+	{
+		$CI =& get_instance();
+		return $CI->fuel->cache->create_id($location);
+	}
 }
 
 // --------------------------------------------------------------------
 
-/**
- * Creates the admin URL for FUEL (e.g. http://localhost/MY_PROJECT/fuel/admin)
- *
- * @access	public
- * @param	string
- * @param	boolean
- * @return	string
- */
-function fuel_url($uri = '', $query_string = FALSE)
+if ( ! function_exists('fuel_url'))
 {
-	$CI =& get_instance();
-	$uri = fuel_uri($uri, $query_string);
-	return site_url($uri, NULL, FALSE);
+	/**
+	 * Creates the admin URL for FUEL (e.g. http://localhost/MY_PROJECT/fuel/admin)
+	 *
+	 * @access	public
+	 * @param	string
+	 * @param	boolean
+	 * @return	string
+	 */
+	function fuel_url($uri = '', $query_string = FALSE)
+	{
+		$CI =& get_instance();
+		$uri = fuel_uri($uri, $query_string);
+		return site_url($uri, NULL, FALSE);
+	}
 }
 
 // --------------------------------------------------------------------
 
-/**
- * Returns the FUEL admin URI path
- *
- * @access	public
- * @param	string
- * @param	boolean
- * @return	string
- */
-function fuel_uri($uri = '', $query_string = FALSE)
+if ( ! function_exists('fuel_uri'))
 {
-	$CI =& get_instance();
-	if (is_bool($query_string) AND $query_string !== FALSE)
+	/**
+	 * Returns the FUEL admin URI path
+	 *
+	 * @access	public
+	 * @param	string
+	 * @param	boolean
+	 * @return	string
+	 */
+	function fuel_uri($uri = '', $query_string = FALSE)
 	{
-		$query_string = $_GET;
-	}
-	$q = '';
-	if (!empty($query_string))
-	{
-		if (is_array($query_string))
+		$CI =& get_instance();
+		if (is_bool($query_string) AND $query_string !== FALSE)
 		{
-			$q_str = http_build_query($query_string);
-			if (!empty($q_str))
-			{
-				$q = '?'.$q_str;
-			}
+			$query_string = $_GET;
 		}
-		else if (is_string($query_string))
+		$q = '';
+		if ( ! empty($query_string))
 		{
-			$q = (strncmp($query_string, '?', 1) !== 0) ? '?'.$query_string : $query_string;
+			if (is_array($query_string))
+			{
+				$q_str = http_build_query($query_string);
+				if ( ! empty($q_str))
+				{
+					$q = '?' . $q_str;
+				}
+			}
+			else if (is_string($query_string))
+			{
+				$q = (strncmp($query_string, '?', 1) !== 0) ? '?' . $query_string : $query_string;
+			}
 		}
+		return $CI->fuel->config('fuel_path') . $uri . $q;
 	}
-	return $CI->fuel->config('fuel_path').$uri.$q;
 }
 
 // --------------------------------------------------------------------
 
-/**
- * Returns the uri segment based on the FUEL admin path
- *
- * @access	public
- * @param	int
- * @param	boolean
- * @return	string
- */
-function fuel_uri_segment($seg_index = 0, $rerouted = FALSE)
+if ( ! function_exists('fuel_uri_segment'))
 {
-	$CI =& get_instance();
-	if ($rerouted)
+	/**
+	 * Returns the uri segment based on the FUEL admin path
+	 *
+	 * @access	public
+	 * @param	int
+	 * @param	boolean
+	 * @return	string
+	 */
+	function fuel_uri_segment($seg_index = 0, $rerouted = FALSE)
 	{
-		return $CI->uri->rsegment(fuel_uri_index($seg_index));
-	}
-	else
-	{
-		return $CI->uri->segment(fuel_uri_index($seg_index));
+		$CI =& get_instance();
+		if ($rerouted)
+		{
+			return $CI->uri->rsegment(fuel_uri_index($seg_index));
+		}
+		else
+		{
+			return $CI->uri->segment(fuel_uri_index($seg_index));
+		}
 	}
 }
 
 // --------------------------------------------------------------------
 
-/**
- * Returns the uri index number based on the FUEL admin path
- *
- * @access	public
- * @param	int
- * @return	int
- */
-function fuel_uri_index($seg_index = 0)
+if ( ! function_exists('fuel_uri_index'))
 {
-	$CI =& get_instance();
-	$fuel_path = $CI->fuel->config('fuel_path');
-	$start_index = count(explode('/', $fuel_path)) - 1;
-	return $start_index + $seg_index;
+	/**
+	 * Returns the uri index number based on the FUEL admin path
+	 *
+	 * @access	public
+	 * @param	int
+	 * @return	int
+	 */
+	function fuel_uri_index($seg_index = 0)
+	{
+		$CI =& get_instance();
+		$fuel_path = $CI->fuel->config('fuel_path');
+		$start_index = count(explode('/', $fuel_path)) - 1;
+		return $start_index + $seg_index;
+	}
 }
 
 // --------------------------------------------------------------------
 
-/**
- * Returns the uri string based on the FUEL admin path
- *
- * @access	public
- * @param	int
- * @param	int
- * @param	boolean
- * @return	string
- */
-function fuel_uri_string($from = 0, $to = NULL, $rerouted = FALSE)
+if ( ! function_exists('fuel_uri_string'))
 {
-	$CI =& get_instance();
-	$fuel_index = fuel_uri_index($from);
-	
-	if ($rerouted)
-	{
-		$segs = $CI->uri->rsegment_array($fuel_index);
-	}
-	else
+	/**
+	 * Returns the uri string based on the FUEL admin path
+	 *
+	 * @access	public
+	 * @param	int
+	 * @param	int
+	 * @param	boolean
+	 * @return	string
+	 */
+	function fuel_uri_string($from = 0, $to = NULL, $rerouted = FALSE)
 	{
-		$segs = $CI->uri->segment_array($fuel_index);
-	}
-	$from = fuel_uri_index($from);
-	if (isset($to))
-	{
-		$to = fuel_uri_index($to);
-		if ($from < $to)
+		$CI =& get_instance();
+		$fuel_index = fuel_uri_index($from);
+
+		if ($rerouted)
 		{
-			$to = $from;
+			$segs = $CI->uri->rsegment_array($fuel_index);
 		}
+		else
+		{
+			$segs = $CI->uri->segment_array($fuel_index);
+		}
+		$from = fuel_uri_index($from);
+		if (isset($to))
+		{
+			$to = fuel_uri_index($to);
+			if ($from < $to)
+			{
+				$to = $from;
+			}
+		}
+		else
+		{
+			$to = sizeof($segs);
+		}
+		$segs = array_slice($segs, $from, $to);
+		$uri = implode('/', $segs);
+		return $uri;
 	}
-	else
-	{
-		$to = sizeof($segs);
-	}
-	$segs = array_slice($segs, $from, $to);
-	$uri = implode('/', $segs);
-	return $uri;
 }
 
 // --------------------------------------------------------------------
 
-/**
- * Check to see if you are logged in and can use inline editing
- *
- * @access	public
- * @return	boolean
- */
-function is_fuelified()
+if ( ! function_exists('is_fuelified'))
 {
-	$CI =& get_instance();
-	return $CI->fuel->auth->is_fuelified();
+	/**
+	 * Check to see if you are logged in and can use inline editing
+	 *
+	 * @access	public
+	 * @return	boolean
+	 */
+	function is_fuelified()
+	{
+		$CI =& get_instance();
+		return $CI->fuel->auth->is_fuelified();
+	}
 }
 
 // --------------------------------------------------------------------
 
-/**
- * Check to see if you are in the FUEL admin
- *
- * @access	public
- * @return	boolean
- */
-function in_fuel_admin()
+if ( ! function_exists('in_fuel_admin'))
 {
-	return (defined('FUEL_ADMIN') AND FUEL_ADMIN === TRUE);
+	/**
+	 * Check to see if you are in the FUEL admin
+	 *
+	 * @access	public
+	 * @return	boolean
+	 */
+	function in_fuel_admin()
+	{
+		return (defined('FUEL_ADMIN') AND FUEL_ADMIN === TRUE);
+	}
 }
 
 // --------------------------------------------------------------------
 
-/**
- * Returns the user language of the person logged in... used for inline editing
- *
- * @access	public
- * @return	string
- */
-function fuel_user_lang()
+if ( ! function_exists('fuel_user_lang'))
 {
-	$CI =& get_instance();
-	return $CI->fuel->auth->user_lang();
+	/**
+	 * Returns the user language of the person logged in... used for inline editing
+	 *
+	 * @access	public
+	 * @return	string
+	 */
+	function fuel_user_lang()
+	{
+		$CI =& get_instance();
+		return $CI->fuel->auth->user_lang();
+	}
 }
 
 // --------------------------------------------------------------------
 
-/**
- * Returns the setting(s) for a particular module
- *
- * @access	public
- * @param	string	Module name
- * @param	string	Settings key (optional)
- * @return	mixed
- */
-function fuel_settings($module, $key = '')
+if ( ! function_exists('fuel_settings'))
 {
-	$CI =& get_instance();
-	return $CI->fuel->settings->get($module, $key);
+	/**
+	 * Returns the setting(s) for a particular module
+	 *
+	 * @access	public
+	 * @param	string	Module name
+	 * @param	string	Settings key (optional)
+	 * @return	mixed
+	 */
+	function fuel_settings($module, $key = '')
+	{
+		$CI =& get_instance();
+		return $CI->fuel->settings->get($module, $key);
+	}
 }
 
 /* End of file fuel_helper.php */

From 944d888faa4f5811108035c227a704d6ae09f1dd Mon Sep 17 00:00:00 2001
From: Martynas Sateika <martynas.sateika@gmail.com>
Date: Mon, 19 Mar 2018 22:03:50 +0000
Subject: [PATCH 017/129] Fix Cli::input called with too many parameters

---
 fuel/modules/fuel/libraries/Cli.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fuel/modules/fuel/libraries/Cli.php b/fuel/modules/fuel/libraries/Cli.php
index 754f33000..907577f9f 100644
--- a/fuel/modules/fuel/libraries/Cli.php
+++ b/fuel/modules/fuel/libraries/Cli.php
@@ -96,7 +96,7 @@ public function new_line($num = 1)
 	public function prompt($msg, $length = 4096)
 	{
 		$this->write($msg." ", FALSE);
-		$line = $this->input($length, $length);
+		$line = $this->input($length);
 		return trim($line); 
 	}
 

From 06b2334a36eec6a72a5cecce5a0d1e25251df53a Mon Sep 17 00:00:00 2001
From: Martynas Sateika <martynas.sateika@gmail.com>
Date: Mon, 19 Mar 2018 22:08:27 +0000
Subject: [PATCH 018/129] Fix constructor that has '$config' passed by
 sub-classes

---
 fuel/modules/fuel/libraries/Fuel_base_library.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fuel/modules/fuel/libraries/Fuel_base_library.php b/fuel/modules/fuel/libraries/Fuel_base_library.php
index 239110705..e6a82e7b9 100644
--- a/fuel/modules/fuel/libraries/Fuel_base_library.php
+++ b/fuel/modules/fuel/libraries/Fuel_base_library.php
@@ -50,7 +50,7 @@ class Fuel_base_library {
 	 * @param	array	config preferences
 	 * @return	void
 	 */	
-	public function __construct()
+	public function __construct($config = array())
 	{
 		$this->CI =& get_instance();
 		if (isset($this->CI->fuel))

From 94699845bc981111ed2bdb2248ac88bcfa855a03 Mon Sep 17 00:00:00 2001
From: David McReynolds <dave@thedaylightstudio.com>
Date: Mon, 19 Mar 2018 15:27:53 -0700
Subject: [PATCH 019/129] =?UTF-8?q?Fixes=20for=20issue=20#447=E2=80=A6=20t?=
 =?UTF-8?q?hanks=20for=20all=20the=20cleanup=20@martynassateika!?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fuel/modules/fuel/controllers/Assets.php       | 4 ++--
 fuel/modules/fuel/core/MY_Model.php            | 2 +-
 fuel/modules/fuel/libraries/Unzip.php          | 4 ++--
 fuel/modules/fuel/models/Base_module_model.php | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/fuel/modules/fuel/controllers/Assets.php b/fuel/modules/fuel/controllers/Assets.php
index 65bb6f39f..4e16b043c 100644
--- a/fuel/modules/fuel/controllers/Assets.php
+++ b/fuel/modules/fuel/controllers/Assets.php
@@ -10,12 +10,12 @@ public function __construct()
 		parent::__construct();
 	}
 	
-	public function items($inline = FALSE)
+	public function items()
 	{
 		$dirs = $this->fuel->assets->dirs();
 		$this->filters['group_id']['options'] = $dirs;
 
-		parent::items($inline);
+		parent::items();
 	}
 
 	public function create($dir = NULL, $inline = FALSE)
diff --git a/fuel/modules/fuel/core/MY_Model.php b/fuel/modules/fuel/core/MY_Model.php
index 0fa76b46d..fc2040c5b 100755
--- a/fuel/modules/fuel/core/MY_Model.php
+++ b/fuel/modules/fuel/core/MY_Model.php
@@ -2944,7 +2944,7 @@ public function form_fields($values = array(), $related = array())
 				}
 				$related_model = $this->load_related_model($rel_config);
 				$related_options = $CI->$related_model->options_list(NULL, $label, $where, $order);
-				$related_vals = ( ! empty($values[$this->key_field])) ? $this->get_related_keys($related_field, $values, $related_model, 'belongs_to', $rel_config, $related_field) : array();
+				$related_vals = ( ! empty($values[$this->key_field])) ? $this->get_related_keys($related_field, $values, $related_model, 'belongs_to', $rel_config) : array();
 				$fields[$related_field] = array('label' => lang('label_belongs_to').'<br />' . humanize($related_field), 'type' => 'multi', 'options' => $related_options, 'value' => $related_vals, 'mode' => 'multi', 'module' => $CI->$related_model->short_name(TRUE));
 			}
 		}
diff --git a/fuel/modules/fuel/libraries/Unzip.php b/fuel/modules/fuel/libraries/Unzip.php
index 0c3849b42..9f3a25f9e 100755
--- a/fuel/modules/fuel/libraries/Unzip.php
+++ b/fuel/modules/fuel/libraries/Unzip.php
@@ -277,14 +277,14 @@ private function _list_files($stop_on_file = FALSE)
 	 *
 	 * @access    Public
 	 * @param     string, boolean
-	 * @return    Unziped file.
+	 * @return    Unzipped file.
 	 */
 	private function _extract_file($compressed_file_name, $target_file_name = FALSE)
 	{
 		if ( ! sizeof($this->compressed_list))
 		{
 			$this->set_debug('Trying to unzip before loading file list... Loading it!');
-			$this->_list_files(FALSE, $compressed_file_name);
+			$this->_list_files(FALSE);
 		}
 
 		$fdetails = &$this->compressed_list[$compressed_file_name];
diff --git a/fuel/modules/fuel/models/Base_module_model.php b/fuel/modules/fuel/models/Base_module_model.php
index 23bd48420..7445ca8b3 100644
--- a/fuel/modules/fuel/models/Base_module_model.php
+++ b/fuel/modules/fuel/models/Base_module_model.php
@@ -954,7 +954,7 @@ public function get_languages($field = NULL)
 		}
 		if (strpos($field, '.') === FALSE) $field = $this->table_name.'.'.$field;
 		$where[$field.' !='] = '';
-		$options = $this->options_list($field, $field, $where, TRUE, FALSE);
+		$options = $this->options_list($field, $field, $where, TRUE);
 		return $options;
 	}
 	

From fb7ac06a569adec998a5531e9746357a1a22e6b0 Mon Sep 17 00:00:00 2001
From: David McReynolds <dave@thedaylightstudio.com>
Date: Mon, 19 Mar 2018 16:02:56 -0700
Subject: [PATCH 020/129] Fix for issue #449

---
 fuel/modules/fuel/libraries/Curl.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fuel/modules/fuel/libraries/Curl.php b/fuel/modules/fuel/libraries/Curl.php
index 60a637741..cd15b5eb9 100644
--- a/fuel/modules/fuel/libraries/Curl.php
+++ b/fuel/modules/fuel/libraries/Curl.php
@@ -600,7 +600,7 @@ public function cookie($url, $cookie, $cleanup = TRUE)
 	{
 		if (is_array($cookie))
 		{
-			$cookie = http_build_query($params, NULL, '&amp;');
+			$cookie = http_build_query($cookie, NULL, '&amp;');
 		}
 		$opts = $this->_opts('cookie', $cookie);
 		$this->add_session($url, $opts);

From 1c3299510da2cb8ab8c9ce5cf6b00f96c95d5e80 Mon Sep 17 00:00:00 2001
From: Martynas Sateika <martynas.sateika@gmail.com>
Date: Mon, 19 Mar 2018 23:46:37 +0000
Subject: [PATCH 021/129] Fix for issue #450

---
 fuel/modules/fuel/helpers/asset_helper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fuel/modules/fuel/helpers/asset_helper.php b/fuel/modules/fuel/helpers/asset_helper.php
index ded9a96dc..027f04900 100644
--- a/fuel/modules/fuel/helpers/asset_helper.php
+++ b/fuel/modules/fuel/helpers/asset_helper.php
@@ -186,7 +186,7 @@ function docs_path($file = NULL, $module = NULL, $absolute = NULL)
 	function cache_path($file = NULL, $module = NULL, $absolute = NULL)
 	{
 		$CI = _get_assets();
-		return $CI->asset->cache_path($file, $CI->asset->assets_cache_folder, $module);
+		return $CI->asset->cache_path($file, $module, $absolute);
 	}
 }
 

From 30d65e0ec0d39bb2baae60afadb8f58dad123287 Mon Sep 17 00:00:00 2001
From: Martynas Sateika <martynas.sateika@gmail.com>
Date: Tue, 20 Mar 2018 00:33:36 +0000
Subject: [PATCH 022/129] Fix 'asset_helper' not passing 'absolute' param to
 Asset library

---
 fuel/modules/fuel/helpers/asset_helper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fuel/modules/fuel/helpers/asset_helper.php b/fuel/modules/fuel/helpers/asset_helper.php
index 027f04900..243fb4da0 100644
--- a/fuel/modules/fuel/helpers/asset_helper.php
+++ b/fuel/modules/fuel/helpers/asset_helper.php
@@ -206,7 +206,7 @@ function cache_path($file = NULL, $module = NULL, $absolute = NULL)
 	function captcha_path($file = NULL, $module = NULL, $absolute = NULL)
 	{
 		$CI = _get_assets();
-		return $CI->asset->captcha_path($file, $module);
+		return $CI->asset->captcha_path($file, $module, $absolute);
 	}
 }
 

From d4d709a527205711052b9d9418f1825efd6a23ac Mon Sep 17 00:00:00 2001
From: David McReynolds <dave@thedaylightstudio.com>
Date: Wed, 21 Mar 2018 11:54:43 -0700
Subject: [PATCH 023/129] =?UTF-8?q?Update=20to=20check=20for=20=E2=80=9Csh?=
 =?UTF-8?q?ow=E2=80=9D=20and=20=E2=80=9Cview=E2=80=9D=20permissions=20if?=
 =?UTF-8?q?=20single=5Fitem=5Fnavigate=20is=20TRUE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fuel/modules/fuel/controllers/Module.php | 25 +++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/fuel/modules/fuel/controllers/Module.php b/fuel/modules/fuel/controllers/Module.php
index 30e96da24..d8b9df3be 100644
--- a/fuel/modules/fuel/controllers/Module.php
+++ b/fuel/modules/fuel/controllers/Module.php
@@ -216,11 +216,30 @@ function items()
 		if ( ! is_ajax())
 		{
 			$item_total = $this->model->list_items_total();
-			if ($this->single_item_navigate AND $this->fuel->auth->has_permission($this->permission, "edit") AND $item_total == 1)
+
+			if ($this->single_item_navigate AND $item_total == 1)
 			{
 				$items = $this->model->list_items();
-				$edit_url = fuel_url($this->module_uri.'/edit/'.$items[0][$this->model->key_field()]);
-				redirect($edit_url);
+				$id = $items[0][$this->model->key_field()];
+
+				// lets check a few permissions
+				if ($this->fuel->auth->has_permission($this->permission, "edit"))
+				{
+					$url = fuel_url($this->module_uri.'/edit/'.$id);
+				}
+				elseif ($this->fuel->auth->has_permission($this->permission, "view"))
+				{
+					$url = fuel_url($this->module_uri.'/view/'.$id);
+				}
+				elseif ($this->fuel->auth->has_permission($this->permission, "show"))
+				{
+					$url = fuel_url($this->module_uri.'/show/'.$id);
+				}
+				
+				if (!empty($url))
+				{
+					redirect($url);	
+				}
 			}
 
 			$this->config->set_item('enable_query_strings', FALSE);

From b375b5d9ea40563b74a72358bc6a4ec64f68fdae Mon Sep 17 00:00:00 2001
From: Martynas Sateika <martynas.sateika@gmail.com>
Date: Wed, 21 Mar 2018 21:18:57 +0000
Subject: [PATCH 024/129] Replace '-at-' with the '@' symbol in Git URLs when
 adding sub-modules

---
 fuel/modules/fuel/controllers/Installer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fuel/modules/fuel/controllers/Installer.php b/fuel/modules/fuel/controllers/Installer.php
index aee0d34d0..8a30bce41 100644
--- a/fuel/modules/fuel/controllers/Installer.php
+++ b/fuel/modules/fuel/controllers/Installer.php
@@ -84,7 +84,7 @@ public function add_git_submodule($params = NULL)
 
 		$uri = trim($this->uri->uri_string(), '/');
 		$uri = str_replace('-at-', '@', $uri);
-		$segs = explode('/', trim($this->uri->uri_string(), '/'));
+		$segs = explode('/', $uri);
 		$segs = array_slice($segs, 3);
 		$module = array_pop($segs);
 		$repo = implode('/', $segs);

From 44f87658e73cc091e9b1b37d674b9655a46ce505 Mon Sep 17 00:00:00 2001
From: Martynas Sateika <martynas.sateika@gmail.com>
Date: Wed, 21 Mar 2018 23:55:22 +0000
Subject: [PATCH 025/129] Fix 'Array to String conversion' error in Asset_test

---
 fuel/modules/fuel/tests/Asset_test.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/fuel/modules/fuel/tests/Asset_test.php b/fuel/modules/fuel/tests/Asset_test.php
index 8e59f3318..d0ac6e2e8 100755
--- a/fuel/modules/fuel/tests/Asset_test.php
+++ b/fuel/modules/fuel/tests/Asset_test.php
@@ -39,21 +39,21 @@ public function test_paths()
 			$p = $expected = WEB_PATH.$this->init['assets_path'].$this->init['assets_folders'][$type].$t['file'];
 
 			// test 1 WITHOUT timestampe cache breaker
-			$test = $this->CI->asset->$t['func']($t['file']);
+			$test = $this->CI->asset->{$t['func']}($t['file']);
 			$expected = $p;
 			$this->run($test, $expected, 'Asset '.$t['func'].'() test 1');
 
 			// test 2 WITH timestampe cache breaker
 			$config = array('asset_append_cache_timestamp' => array($type));
 			$this->_reset($config);
-			$test = $this->CI->asset->$t['func']($t['file']);
+			$test = $this->CI->asset->{$t['func']}($t['file']);
 			$expected = $p.'?c='.strtotime($this->init['assets_last_updated']);
 			$this->run($test, $expected, 'Asset '.$t['func'].'() test 2');
 
 			// test 3 absolute path
 			$config = array('assets_absolute_path' => TRUE);
 			$this->_reset($config);
-			$test = $this->CI->asset->$t['func']($t['file']);
+			$test = $this->CI->asset->{$t['func']}($t['file']);
 			$expected = 'http://'.$_SERVER['HTTP_HOST'].$p;
 			$this->CI->unit->run($test, $expected, 'Asset '.$t['func'].'() test 2');
 		}

From 129363da3d2645831e281cb1afe9cc81e51c4458 Mon Sep 17 00:00:00 2001
From: Martynas Sateika <martynas.sateika@gmail.com>
Date: Thu, 22 Mar 2018 00:02:15 +0000
Subject: [PATCH 026/129] Fix name of test #3 having a different format than #1
 and #2

---
 fuel/modules/fuel/tests/Asset_test.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fuel/modules/fuel/tests/Asset_test.php b/fuel/modules/fuel/tests/Asset_test.php
index d0ac6e2e8..89655602e 100755
--- a/fuel/modules/fuel/tests/Asset_test.php
+++ b/fuel/modules/fuel/tests/Asset_test.php
@@ -55,7 +55,7 @@ public function test_paths()
 			$this->_reset($config);
 			$test = $this->CI->asset->{$t['func']}($t['file']);
 			$expected = 'http://'.$_SERVER['HTTP_HOST'].$p;
-			$this->CI->unit->run($test, $expected, 'Asset '.$t['func'].'() test 2');
+			$this->run($test, $expected, 'Asset '.$t['func'].'() test 2');
 		}
 	}
 	

From 233b8fa4fe8b8311175bf4f8ad752e2c105c2a58 Mon Sep 17 00:00:00 2001
From: Martynas Sateika <martynas.sateika@gmail.com>
Date: Thu, 22 Mar 2018 00:03:37 +0000
Subject: [PATCH 027/129] Fix incorrect test name reported in Asset_test

---
 fuel/modules/fuel/tests/Asset_test.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fuel/modules/fuel/tests/Asset_test.php b/fuel/modules/fuel/tests/Asset_test.php
index 89655602e..8e2ff8daa 100755
--- a/fuel/modules/fuel/tests/Asset_test.php
+++ b/fuel/modules/fuel/tests/Asset_test.php
@@ -55,7 +55,7 @@ public function test_paths()
 			$this->_reset($config);
 			$test = $this->CI->asset->{$t['func']}($t['file']);
 			$expected = 'http://'.$_SERVER['HTTP_HOST'].$p;
-			$this->run($test, $expected, 'Asset '.$t['func'].'() test 2');
+			$this->run($test, $expected, 'Asset '.$t['func'].'() test 3');
 		}
 	}
 	

From 7a6c8802572ec4647546c04d53d44b3f56151a64 Mon Sep 17 00:00:00 2001
From: David McReynolds <dave@thedaylightstudio.com>
Date: Wed, 21 Mar 2018 22:55:31 -0700
Subject: [PATCH 028/129] Fix for issue #453

---
 fuel/modules/fuel/helpers/MY_date_helper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fuel/modules/fuel/helpers/MY_date_helper.php b/fuel/modules/fuel/helpers/MY_date_helper.php
index 909137aea..7188099de 100644
--- a/fuel/modules/fuel/helpers/MY_date_helper.php
+++ b/fuel/modules/fuel/helpers/MY_date_helper.php
@@ -331,7 +331,7 @@ function format_db_date($y = NULL, $m = NULL, $d = NULL, $h = NULL, $i = NULL, $
 	{
 		if (empty($m) AND !empty($y))
 		{
-			$dates = convert_date_to_array($y);
+			$dates = date_parse($y);
 			$str = $dates['year'].'-'.$dates['month'].'-'.$dates['day'].' '.$dates['hour'].':'.$dates['min'].':'.$dates['sec'];
 		}
 		else

From ff9d40806b92e8e30e7e236fe624a6bdf6bd9a63 Mon Sep 17 00:00:00 2001
From: David McReynolds <dave@thedaylightstudio.com>
Date: Wed, 21 Mar 2018 22:55:51 -0700
Subject: [PATCH 029/129] Fix for issue identified here:
 http://forum.getfuelcms.com/discussion/2888/assets-filesize-listing

---
 fuel/modules/fuel/models/Fuel_assets_model.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/fuel/modules/fuel/models/Fuel_assets_model.php b/fuel/modules/fuel/models/Fuel_assets_model.php
index d77d5b51e..fdd8c97d1 100644
--- a/fuel/modules/fuel/models/Fuel_assets_model.php
+++ b/fuel/modules/fuel/models/Fuel_assets_model.php
@@ -52,8 +52,7 @@ public function __construct()
 		$CI =& get_instance();
 
 		$CI->load->library('validator');
-		$CI->load->helper('directory');
-		$CI->load->helper('file');
+		$CI->load->helper(array('directory', 'file', 'number'));
 		
 		$this->validator = new Validator();
 		$this->validator->register_to_global_errors = FALSE;
@@ -155,7 +154,7 @@ public function list_items($limit = null, $offset = 0, $col = 'name', $order = '
 					
 					//$file['filename'] = $files[$key]['name'];
 					$file['name'] = $key;
-					$file['preview/kb'] = $files[$key]['size'];
+					$file['preview/kb'] = round($files[$key]['size'] / 1024, 2);
 					$file['link'] = NULL;
 					$file['last_updated'] = date('Y-m-d H:i:s', $files[$key]['date']);
 					$return[] = $file;
@@ -175,7 +174,7 @@ public function list_items($limit = null, $offset = 0, $col = 'name', $order = '
 		{
 			if (is_image_file($return[$key]['name']))
 			{
-				$return[$key]['preview/kb'] = $return[$key]['preview/kb'].' kb <div class="img_crop"><a href="'.$asset_type_path.$return[$key]['name'].'" target="_blank"><img src="'.$asset_type_path.($return[$key]['name']).'?c='.time().'" border="0"></a></div>';
+				$return[$key]['preview/kb'] = $return[$key]['preview/kb'].' kB <div class="img_crop"><a href="'.$asset_type_path.$return[$key]['name'].'" target="_blank"><img src="'.$asset_type_path.($return[$key]['name']).'?c='.time().'" border="0"></a></div>';
 				$return[$key]['link'] = '<a href="'.$asset_type_path.$return[$key]['name'].'" target="_blank">'.$asset_dir.'/'.$return[$key]['name'].'</a>';
 			}
 			else

From 73eaea2e434bfc330c7cabe702e217642123b3bf Mon Sep 17 00:00:00 2001
From: David McReynolds <dave@thedaylightstudio.com>
Date: Wed, 21 Mar 2018 22:58:26 -0700
Subject: [PATCH 030/129] =?UTF-8?q?Removed=20extra=20=E2=80=9C/=E2=80=9C?=
 =?UTF-8?q?=20identified=20here:=20http://forum.getfuelcms.com/discussion/?=
 =?UTF-8?q?2887/basefuelcontroller?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fuel/assets/js/fuel/controller/BaseFuelController.js        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fuel/modules/fuel/assets/js/fuel/controller/BaseFuelController.js b/fuel/modules/fuel/assets/js/fuel/controller/BaseFuelController.js
index 12fd83d16..5a2bb68f6 100755
--- a/fuel/modules/fuel/assets/js/fuel/controller/BaseFuelController.js
+++ b/fuel/modules/fuel/assets/js/fuel/controller/BaseFuelController.js
@@ -11,7 +11,7 @@ fuel.controller.BaseFuelController = jqx.lib.BaseController.extend({
 		this.assetFolder = 'images';
 		this.pageVals = {};
 		this.cache = new jqx.Cache();
-		this.modulePath = jqx.config.fuelPath + '/' + this.module;
+		this.modulePath = jqx.config.fuelPath + this.module;
 		this.inline = parseInt($('#fuel_inline').val());
 		this.tableAjaxURL = this.modulePath + '/items/';
 		if (this.inline != 0) this.tableAjaxURL += '/?inline=' + this.inline;

From 64923f464c61e32ccfb54cc186b52ab16a9776c7 Mon Sep 17 00:00:00 2001
From: David McReynolds <dave@thedaylightstudio.com>
Date: Thu, 22 Mar 2018 13:43:34 -0700
Subject: [PATCH 031/129] Fix for issue #456

---
 fuel/modules/fuel/libraries/Fuel.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/fuel/modules/fuel/libraries/Fuel.php b/fuel/modules/fuel/libraries/Fuel.php
index 4b5a6d6e7..03e75ee26 100644
--- a/fuel/modules/fuel/libraries/Fuel.php
+++ b/fuel/modules/fuel/libraries/Fuel.php
@@ -503,6 +503,8 @@ public function __get($var)
 			}
 			else
 			{
+				// To resolve issue when called outside of admin
+				$this->load_language('fuel', 'fuel');
 				throw new Exception(lang('error_class_property_does_not_exist', $var));
 			}
 		}

From fa570b6baa6725ecae111a19e4f73d6ce917c24f Mon Sep 17 00:00:00 2001
From: David McReynolds <dave@thedaylightstudio.com>
Date: Thu, 22 Mar 2018 14:01:29 -0700
Subject: [PATCH 032/129] Additional fix for issue #456

---
 fuel/modules/fuel/libraries/Fuel.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fuel/modules/fuel/libraries/Fuel.php b/fuel/modules/fuel/libraries/Fuel.php
index 03e75ee26..736d2b941 100644
--- a/fuel/modules/fuel/libraries/Fuel.php
+++ b/fuel/modules/fuel/libraries/Fuel.php
@@ -504,7 +504,7 @@ public function __get($var)
 			else
 			{
 				// To resolve issue when called outside of admin
-				$this->load_language('fuel', 'fuel');
+				$this->load_language('fuel');
 				throw new Exception(lang('error_class_property_does_not_exist', $var));
 			}
 		}

From 5f8c6ac23d7c7333818cffdd7300af14451e1d15 Mon Sep 17 00:00:00 2001
From: Martynas Sateika <martynas.sateika@gmail.com>
Date: Thu, 22 Mar 2018 21:38:56 +0000
Subject: [PATCH 033/129] Replace call to function 'dir_files' with call to
 method in Fuel_assets

---
 fuel/modules/fuel/models/Fuel_assets_model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fuel/modules/fuel/models/Fuel_assets_model.php b/fuel/modules/fuel/models/Fuel_assets_model.php
index fdd8c97d1..68ef8e11a 100644
--- a/fuel/modules/fuel/models/Fuel_assets_model.php
+++ b/fuel/modules/fuel/models/Fuel_assets_model.php
@@ -261,7 +261,7 @@ public function record_count($dir = 'images')
 	{
 		$CI =& get_instance();
 		$assets_path = WEB_ROOT.$CI->config->item('assets_path').$dir.'/';
-		$files = dir_files($assets_path, false, false);
+		$files = $CI->fuel->assets->dir_files($assets_path, false, false);
 		return count($files);
 	}
 	

From 7e75c824b31fa8a98c3d333178688f6d8b050350 Mon Sep 17 00:00:00 2001
From: Martynas Sateika <martynas.sateika@gmail.com>
Date: Thu, 22 Mar 2018 22:09:25 +0000
Subject: [PATCH 034/129] Fix absolute path passed to 'dir_files'

---
 fuel/modules/fuel/models/Fuel_assets_model.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/fuel/modules/fuel/models/Fuel_assets_model.php b/fuel/modules/fuel/models/Fuel_assets_model.php
index 68ef8e11a..fb0d9daa1 100644
--- a/fuel/modules/fuel/models/Fuel_assets_model.php
+++ b/fuel/modules/fuel/models/Fuel_assets_model.php
@@ -260,8 +260,7 @@ public function get_file($file)
 	public function record_count($dir = 'images')
 	{
 		$CI =& get_instance();
-		$assets_path = WEB_ROOT.$CI->config->item('assets_path').$dir.'/';
-		$files = $CI->fuel->assets->dir_files($assets_path, false, false);
+		$files = $CI->fuel->assets->dir_files($dir, false, false);
 		return count($files);
 	}
 	

From deb3ca02d2e28aaf61ccfe04e059267a00ad2ed5 Mon Sep 17 00:00:00 2001
From: Martynas Sateika <martynas.sateika@gmail.com>
Date: Thu, 22 Mar 2018 22:21:43 +0000
Subject: [PATCH 035/129] Fix several PHPDoc issues in Fuel_assets_model

---
 fuel/modules/fuel/libraries/Validator.php      |  2 +-
 fuel/modules/fuel/models/Fuel_assets_model.php | 18 +++++++-----------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/fuel/modules/fuel/libraries/Validator.php b/fuel/modules/fuel/libraries/Validator.php
index df907cff8..c759a1b2a 100644
--- a/fuel/modules/fuel/libraries/Validator.php
+++ b/fuel/modules/fuel/libraries/Validator.php
@@ -293,7 +293,7 @@ public function catch_errors($errors, $key = NULL)
 	 * Retrieve errors
 	 *
 	 * @access public
-	 * @return assoc array of errors and messages
+	 * @return array	assoc array of errors and messages
 	 */
 	public function get_errors()
 	{
diff --git a/fuel/modules/fuel/models/Fuel_assets_model.php b/fuel/modules/fuel/models/Fuel_assets_model.php
index fb0d9daa1..bfde2e5f2 100644
--- a/fuel/modules/fuel/models/Fuel_assets_model.php
+++ b/fuel/modules/fuel/models/Fuel_assets_model.php
@@ -64,7 +64,7 @@ public function __construct()
 	 *
 	 * @access	public
 	 * @param	array	Search filters
-	 * @return	void
+	 * @return	string
 	 */	
 	public function table_name()
 	{
@@ -99,10 +99,10 @@ public function add_filters($filters)
 	 *
 	 * @access	public
 	 * @param	int		limit
-	 * @param	string	offset
+	 * @param	int		offset
 	 * @param	string	column
 	 * @param	string	order
-	 * @return	array
+	 * @return	array|int
 	 */	
 	public function list_items($limit = null, $offset = 0, $col = 'name', $order = 'asc', $just_count = FALSE)
 	{
@@ -185,7 +185,6 @@ public function list_items($limit = null, $offset = 0, $col = 'name', $order = '
 		}
 		return $return;
 	}
-	
 
 	// --------------------------------------------------------------------
 
@@ -260,7 +259,7 @@ public function get_file($file)
 	public function record_count($dir = 'images')
 	{
 		$CI =& get_instance();
-		$files = $CI->fuel->assets->dir_files($dir, false, false);
+		$files = $CI->fuel->assets->dir_files($dir, FALSE, FALSE);
 		return count($files);
 	}
 	
@@ -275,8 +274,6 @@ public function record_count($dir = 'images')
 	 */	
 	public function delete($file)
 	{
-		$CI =& get_instance();
-
 		if (is_array($file))
 		{
 			$valid = TRUE;
@@ -425,7 +422,7 @@ public function form_fields($values = array())
 		{
 			$fields['subfolder'] = array('label' => lang('form_label_subfolder'), 'comment' => lang('assets_comment_subfolder'));
 		}
-		$fields['overwrite'] = array('label' => lang('form_label_overwrite'), 'type' => 'checkbox', 'comment' => lang('assets_comment_overwrite'), 'checked' => true, 'value' => '1');
+		$fields['overwrite'] = array('label' => lang('form_label_overwrite'), 'type' => 'checkbox', 'comment' => lang('assets_comment_overwrite'), 'checked' => TRUE, 'value' => '1');
 		$fields['unzip'] = array('type' => 'checkbox', 'label' => lang('form_label_unzip'), 'comment' => lang('assets_comment_unzip'), 'value' => 1);
 
 		$fields[lang('assets_heading_image_specific')] = array('type' => 'fieldset', 'class' => 'tab');
@@ -471,8 +468,7 @@ public function on_after_post($values)
 	 * Placeholder function (not used)
 	 *
 	 * @access	public
-	 * @param   array Posted values
-	 * @return	void
+	 * @return	boolean
 	 */
 	public function has_auto_increment()
 	{
@@ -484,7 +480,7 @@ public function has_auto_increment()
 	 *
 	 * @access	public
 	 * @param   array Posted values
-	 * @return	void
+	 * @return	array
 	 */
 	public function filters($values = array())
 	{

From 87b51532d8176c6b0bef7a837769a150e0bd5e10 Mon Sep 17 00:00:00 2001
From: Martynas Sateika <martynas.sateika@gmail.com>
Date: Fri, 23 Mar 2018 22:24:38 +0000
Subject: [PATCH 036/129] Fix FUEL not finding pages whose location starts with
 'http'

---
 fuel/modules/fuel/models/Fuel_pages_model.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/fuel/modules/fuel/models/Fuel_pages_model.php b/fuel/modules/fuel/models/Fuel_pages_model.php
index 9d81c13e1..910d0507a 100644
--- a/fuel/modules/fuel/models/Fuel_pages_model.php
+++ b/fuel/modules/fuel/models/Fuel_pages_model.php
@@ -193,8 +193,7 @@ public function list_locations($include_unpublished = FALSE)
 	 */	
 	public function find_by_location($location, $just_published = 'yes')
 	{
-		
-		if (substr($location, 0, 4) == 'http')
+		if (strpos($location, 'http://') === 0 || strpos($location, 'https://') === 0)
 		{
 			$location = substr($location, strlen(site_url()));
 		}

From 9b5999164751126ed1d98cf414609c25dfa128d1 Mon Sep 17 00:00:00 2001
From: David McReynolds <dave@thedaylightstudio.com>
Date: Fri, 23 Mar 2018 22:06:35 -0700
Subject: [PATCH 037/129] Fix for issue #453

---
 fuel/modules/fuel/helpers/MY_date_helper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fuel/modules/fuel/helpers/MY_date_helper.php b/fuel/modules/fuel/helpers/MY_date_helper.php
index 7188099de..75ef9db8a 100644
--- a/fuel/modules/fuel/helpers/MY_date_helper.php
+++ b/fuel/modules/fuel/helpers/MY_date_helper.php
@@ -332,7 +332,7 @@ function format_db_date($y = NULL, $m = NULL, $d = NULL, $h = NULL, $i = NULL, $
 		if (empty($m) AND !empty($y))
 		{
 			$dates = date_parse($y);
-			$str = $dates['year'].'-'.$dates['month'].'-'.$dates['day'].' '.$dates['hour'].':'.$dates['min'].':'.$dates['sec'];
+			$str = $dates['year'].'-'.$dates['month'].'-'.$dates['day'].' '.$dates['hour'].':'.$dates['minute'].':'.$dates['second'];
 		}
 		else
 		{

From 4662f5dca4886cef3cfc56f09ca8fbf4132e4922 Mon Sep 17 00:00:00 2001
From: David McReynolds <dave@thedaylightstudio.com>
Date: Mon, 26 Mar 2018 08:31:52 -0700
Subject: [PATCH 038/129] Removed compatability_helper functions no longer
 needed for issue #461

---
 .../fuel/helpers/compatibility_helper.php     | 140 ------------------
 1 file changed, 140 deletions(-)

diff --git a/fuel/modules/fuel/helpers/compatibility_helper.php b/fuel/modules/fuel/helpers/compatibility_helper.php
index 61b7f558e..ad3bb295d 100644
--- a/fuel/modules/fuel/helpers/compatibility_helper.php
+++ b/fuel/modules/fuel/helpers/compatibility_helper.php
@@ -29,146 +29,6 @@
 
 // --------------------------------------------------------------------
 
-if (!function_exists('json_encode'))
-{
-	/**
-	 * Used for older versions of PHP that don't support json_encode.
-	 * another option http://derekallard.com/blog/post/using-json-on-servers-without-native-support/
-	 * Original function found here: http://php.net/manual/en/function.json-encode.php
-	 *
-	 * @access	public
-	 * @param	mixed	php value to encode into JSON format
-	 * @return	string
-	 */
-	function json_encode($a=FALSE)
-	{
-		if (is_null($a)) return 'null';
-		if ($a === FALSE) return 'false';
-		if ($a === TRUE) return 'true';
-		if (is_scalar($a))
-		{
-			if (is_float($a))
-			{
-				// Always use "." for floats.
-				return floatval(str_replace(",", ".", strval($a)));
-			}
-
-			if (is_string($a))
-			{
-				static $jsonReplaces = array(array("\\", "/", "\n", "\t", "\r", "\b", "\f", '"'), array('\\\\', '\\/', '\\n', '\\t', '\\r', '\\b', '\\f', '\"'));
-				return '"' . str_replace($jsonReplaces[0], $jsonReplaces[1], $a) . '"';
-			}
-			else
-				return $a;
-		}
-		$isList = TRUE;
-		for ($i = 0, reset($a); $i < count($a); $i++, next($a))
-		{
-			if (key($a) !== $i)
-			{
-				$isList = FALSE;
-				break;
-			}
-		}
-		$result = array();
-		if ($isList)
-		{
-			foreach ($a as $v) $result[] = json_encode($v);
-			return '[' . join(',', $result) . ']';
-		}
-		else
-		{
-			foreach ($a as $k => $v) $result[] = json_encode($k).':'.json_encode($v);
-			return '{' . join(',', $result) . '}';
-		}
-	}
-}
-
-// --------------------------------------------------------------------
-
-if ( !function_exists('json_decode'))
-{
-	/**
-	 * Used for older versions of PHP that don't support json_decode.
-	 * another option http://derekallard.com/blog/post/using-json-on-servers-without-native-support/
-	 * Original function found here: http://php.net/manual/en/function.json-decode.php
-	 *
-	 * @access	public
-	 * @param	string	json formatted string
-	 * @return	mixed
-	 */
-	function json_decode($json) 
-	{  
-		// Author: walidator.info 2009 
-		$comment = FALSE; 
-		$out = '$x='; 
-		
-		for ($i=0; $i<strlen($json); $i++) 
-		{ 
-			if (!$comment) 
-			{ 
-				if ($json[$i] == '{')
-				{
-					$out .= ' array('; 
-				}
-				else if ($json[$i] == '}')
-				{
-					$out .= ')'; 
-				}
-				else if ($json[$i] == ':')
-				{
-					$out .= '=>';
-				}
-				else
-				{
-					$out .= $json[$i];
-				}
-			} 
-			else
-			{
-				$out .= $json[$i];
-			}
-			if ($json[$i] == '"')
-			{
-				$comment = !$comment; 
-			}
-		} 
-		eval($out . ';'); 
-		return $x; 
-	}  
-}
-
-// ------------------------------------------------------------------------
-
-if (!function_exists('str_getcsv'))
-{
-	/**
-	 * Used for older versions of PHP that don't support str_getcsv.
-	 * Original function found here: http://php.net/manual/en/function.str-getcsv.php
-	 *
-	 * @access	public
-	 * @param	string
-	 * @param	string
-	 * @param	string
-	 * @param	string
-	 * @return	mixed
-	 */
-	function str_getcsv($input, $delimiter = ",", $enclosure = '"', $escape = "\\")
-	{ 
-		$fiveMBs = 5 * 1024 * 1024; 
-		$fp = fopen("php://temp/maxmemory:$fiveMBs", 'r+'); 
-		fputs($fp, $input); 
-		rewind($fp); 
-
-		$data = fgetcsv($fp, 1000, $delimiter, $enclosure); //	$escape only got added in 5.3.0 
-
-		fclose($fp); 
-		return $data; 
-	} 
-}
-
-// --------------------------------------------------------------------
-
 if(!function_exists('str_putcsv'))
 {
 	/**

From 57dfe921b32a2ad650ee19b44b3bf009342001e3 Mon Sep 17 00:00:00 2001
From: David McReynolds <dave@thedaylightstudio.com>
Date: Mon, 26 Mar 2018 08:36:23 -0700
Subject: [PATCH 039/129] Fix for issue #463

---
 fuel/modules/fuel/controllers/Pages.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/fuel/modules/fuel/controllers/Pages.php b/fuel/modules/fuel/controllers/Pages.php
index e5a2c51f1..f7dc5f3bb 100644
--- a/fuel/modules/fuel/controllers/Pages.php
+++ b/fuel/modules/fuel/controllers/Pages.php
@@ -1054,9 +1054,6 @@ public function upload()
 				$upload_data = $this->upload->data();
 				$error = FALSE;
 
-				// read in the file so we can filter it
-				$file = read_file($upload_data['full_path']);
-
 				// sanitize the file before saving
 				$id = $this->input->post('id', TRUE);
 				$pagevars = $this->fuel->pages->import($id);

From 043aa5a43f3da8d0f187864eabcd8dc1d1765dda Mon Sep 17 00:00:00 2001
From: David McReynolds <dave@thedaylightstudio.com>
Date: Mon, 26 Mar 2018 08:55:55 -0700
Subject: [PATCH 040/129] Fix for issue when logged in and using aggressive
 redirects it displaying a warning.

---
 fuel/modules/fuel/libraries/Fuel_redirects.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/fuel/modules/fuel/libraries/Fuel_redirects.php b/fuel/modules/fuel/libraries/Fuel_redirects.php
index 47cde8a8c..1274a7b0c 100644
--- a/fuel/modules/fuel/libraries/Fuel_redirects.php
+++ b/fuel/modules/fuel/libraries/Fuel_redirects.php
@@ -755,6 +755,9 @@ protected function _get_uri()
 	 */
 	protected function _session_init($uri)
 	{
+		// Load this here to prevent errors if logged into CMS and a session_start() has already been called
+		$this->CI->load->library('session');
+
 		$this->has_session = session_id();
 
 		if (!$this->has_session)
@@ -780,7 +783,6 @@ protected function _session_init($uri)
 		{
 			$_SESSION[self::REDIRECT_COUNT] = 0;
 		}
-
 	}
 
 	/**

From b30ccfa5cae47aa5e88081ed2e95320d343332c5 Mon Sep 17 00:00:00 2001
From: Martynas Sateika <martynas.sateika@gmail.com>
Date: Mon, 26 Mar 2018 21:19:06 +0000
Subject: [PATCH 041/129] Make 'currency' interpret NULL value as '0'. Add unit
 tests.

---
 fuel/modules/fuel/helpers/format_helper.php   |   4 -
 .../modules/fuel/tests/Format_helper_test.php | 107 ++++++++++++++++++
 2 files changed, 107 insertions(+), 4 deletions(-)
 create mode 100644 fuel/modules/fuel/tests/Format_helper_test.php

diff --git a/fuel/modules/fuel/helpers/format_helper.php b/fuel/modules/fuel/helpers/format_helper.php
index e55621bfb..6274266ec 100644
--- a/fuel/modules/fuel/helpers/format_helper.php
+++ b/fuel/modules/fuel/helpers/format_helper.php
@@ -43,10 +43,6 @@
 	 */
 	function currency($value, $symbol = '$',  $include_cents = TRUE, $decimal_sep = '.', $thousands_sep = ',')
 	{
-		if (!isset($value) OR $value === "")
-		{
-			return;
-		}
 		$value = (float) $value;
 		$dec_num = (!$include_cents) ? 0 : 2;
 		$is_negative = (strpos($value, '-') === 0) ? '-' : '';
diff --git a/fuel/modules/fuel/tests/Format_helper_test.php b/fuel/modules/fuel/tests/Format_helper_test.php
new file mode 100644
index 000000000..7f6af051b
--- /dev/null
+++ b/fuel/modules/fuel/tests/Format_helper_test.php
@@ -0,0 +1,107 @@
+<?php  if (!defined('BASEPATH')) exit('No direct script access allowed');
+
+require_once('Fuel_test_base.php');
+
+/**
+ * FUEL CMS
+ * http://www.getfuelcms.com
+ *
+ * An open source Content Management System based on the
+ * Codeigniter framework (http://codeigniter.com)
+ *
+ * @package		FUEL CMS
+ * @author		David McReynolds @ Daylight Studio
+ * @copyright	Copyright (c) 2018, Daylight Studio LLC.
+ * @license		http://docs.getfuelcms.com/general/license
+ * @link		http://www.getfuelcms.com
+ * @filesource
+ */
+
+// ------------------------------------------------------------------------
+
+/**
+ * FUEL Format Helper Test
+ *
+ * @package		FUEL CMS
+ * @subpackage	Helpers
+ * @category	Helpers
+ * @author		David McReynolds @ Daylight Studio
+ * @link		http://docs.getfuelcms.com/helpers/format_helper
+ */
+
+// ------------------------------------------------------------------------
+
+class Format_helper_test extends Tester_base {
+
+	public function setup()
+	{
+		parent::setup();
+		$this->CI->load->helper('format');
+	}
+
+	// ------------------------------------------------------------------------
+
+	public function test_currency_nullValueSupplied()
+	{
+		$actual = currency(NULL);
+		$expected = '$0.00';
+		$this->run($actual, $expected, 'value NULL');
+	}
+
+	// ------------------------------------------------------------------------
+
+	public function test_currency_nullSymbol()
+	{
+		$actual = currency('5', NULL);
+		$expected = '5.00';
+		$this->run($actual, $expected, 'symbol NULL');
+	}
+
+	// ------------------------------------------------------------------------
+
+	public function test_currency_includeCentsFalse()
+	{
+		$actual = currency('5', '$', FALSE);
+		$expected = '$5';
+		$this->run($actual, $expected, 'include_cents FALSE');
+	}
+
+	public function test_currency_includeCentsNull()
+	{
+		$actual = currency('5', '$', NULL);
+		$expected = '$5';
+		$this->run($actual, $expected, 'include_cents NULL');
+	}
+
+	// ------------------------------------------------------------------------
+
+	public function test_currency_customDecimalSeparator()
+	{
+		$actual = currency('5', '$', TRUE, ',');
+		$expected = '$5,00';
+		$this->run($actual, $expected, 'custom decimal separator');
+	}
+
+	// ------------------------------------------------------------------------
+
+	public function test_currency_exceedsThousand()
+	{
+		$actual = currency('5000');
+		$expected = '$5,000.00';
+		$note = 'is thousands separator displayed when value exceeds 1000';
+		$this->run($actual, $expected, 'default thousands separator', $note);
+	}
+
+	// ------------------------------------------------------------------------
+
+	public function test_currency_customThousandsSeparator()
+	{
+		$actual = currency('5000', '$', TRUE, '.', 'a');
+		$expected = '$5a000.00';
+		$this->run($actual, $expected, 'custom thousands separator');
+	}
+
+}
+
+/* End of file Format_helper_test.php */
+/* Location: ./modules/fuel/tests/Format_helper_test.php */

From 62a9d9e7c2237f27198ae885492b0c27fd1c962b Mon Sep 17 00:00:00 2001
From: Martynas Sateika <martynas.sateika@gmail.com>
Date: Mon, 26 Mar 2018 22:00:16 +0000
Subject: [PATCH 042/129] Add some unit tests of the Google helper

---
 .../modules/fuel/tests/Format_helper_test.php |  2 +
 .../modules/fuel/tests/Google_helper_test.php | 84 +++++++++++++++++++
 2 files changed, 86 insertions(+)
 create mode 100644 fuel/modules/fuel/tests/Google_helper_test.php

diff --git a/fuel/modules/fuel/tests/Format_helper_test.php b/fuel/modules/fuel/tests/Format_helper_test.php
index 7f6af051b..8a7b5a518 100644
--- a/fuel/modules/fuel/tests/Format_helper_test.php
+++ b/fuel/modules/fuel/tests/Format_helper_test.php
@@ -66,6 +66,8 @@ public function test_currency_includeCentsFalse()
 		$this->run($actual, $expected, 'include_cents FALSE');
 	}
 
+	// ------------------------------------------------------------------------
+
 	public function test_currency_includeCentsNull()
 	{
 		$actual = currency('5', '$', NULL);
diff --git a/fuel/modules/fuel/tests/Google_helper_test.php b/fuel/modules/fuel/tests/Google_helper_test.php
new file mode 100644
index 000000000..12fb93fca
--- /dev/null
+++ b/fuel/modules/fuel/tests/Google_helper_test.php
@@ -0,0 +1,84 @@
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+
+require_once('Fuel_test_base.php');
+
+/**
+ * FUEL CMS
+ * http://www.getfuelcms.com
+ *
+ * An open source Content Management System based on the
+ * Codeigniter framework (http://codeigniter.com)
+ *
+ * @package        FUEL CMS
+ * @author        David McReynolds @ Daylight Studio
+ * @copyright    Copyright (c) 2018, Daylight Studio LLC.
+ * @license        http://docs.getfuelcms.com/general/license
+ * @link        http://www.getfuelcms.com
+ * @filesource
+ */
+
+// ------------------------------------------------------------------------
+
+/**
+ * FUEL Google Helper Test
+ *
+ * @package        FUEL CMS
+ * @subpackage    Helpers
+ * @category    Helpers
+ * @author        David McReynolds @ Daylight Studio
+ * @link        http://docs.getfuelcms.com/helpers/format_helper
+ */
+
+// ------------------------------------------------------------------------
+
+class Google_helper_test extends Tester_base
+{
+	private $data = array();
+
+	public function setup()
+	{
+		parent::setup();
+		$this->CI->load->helper('google');
+
+		$this->data = array(
+			'address_components' => array(
+				array(
+					'types' => array('route'),
+					'long_name' => 'route long name',
+					'short_name' => 'route short name',
+				),
+			),
+		);
+	}
+
+	// ------------------------------------------------------------------------
+
+	public function test_google_geolocate_return_address_components()
+	{
+		$actual = google_geolocate($this->data, 'address_components');
+		$expected = $this->data['address_components'];
+		$this->run($actual, $expected, 'google_geolocate return address_components');
+	}
+
+	// ------------------------------------------------------------------------
+
+	public function test_google_geolocate_return_route_long()
+	{
+		$actual = google_geolocate($this->data, 'route', TRUE);
+		$expected = 'route long name';
+		$this->run($actual, $expected, 'google_geolocate return route (long)');
+	}
+
+	// ------------------------------------------------------------------------
+
+	public function test_google_geolocate_return_route_short()
+	{
+		$actual = google_geolocate($this->data, 'route', FALSE);
+		$expected = 'route short name';
+		$this->run($actual, $expected, 'google_geolocate return route (short)');
+	}
+
+}
+
+/* End of file Google_helper_test.php */
+/* Location: ./modules/fuel/tests/Google_helper_test.php */

From 9eb2f09bed1acfc0d44ace3e850e289aa6e66140 Mon Sep 17 00:00:00 2001
From: Martynas Sateika <martynas.sateika@gmail.com>
Date: Mon, 26 Mar 2018 22:06:10 +0000
Subject: [PATCH 043/129] Remove deprecated 'create_function' in google_helper

---
 fuel/modules/fuel/helpers/google_helper.php   | 39 +++++++++----------
 .../modules/fuel/tests/Google_helper_test.php | 22 +++++------
 2 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/fuel/modules/fuel/helpers/google_helper.php b/fuel/modules/fuel/helpers/google_helper.php
index 1b43c3d01..c5bb0d46e 100644
--- a/fuel/modules/fuel/helpers/google_helper.php
+++ b/fuel/modules/fuel/helpers/google_helper.php
@@ -396,7 +396,6 @@ function google_geolocate($data, $return = 'all', $long = TRUE)
 				}
 			}
 			$CI->curl->close();
-			//curl_close($ch);
 		}
 		else
 		{
@@ -408,34 +407,34 @@ function google_geolocate($data, $return = 'all', $long = TRUE)
 			return NULL;
 		}
 
-		$lookup_func = create_function('$data, $key, $single = FALSE', '
-				$components = $data["address_components"];
-				$return = array("long_name" => "", "short_name" => "");
+		$lookup_func = function($data, $key, $single = FALSE) {
+			$components = $data['address_components'];
+			$return = array('long_name' => '', 'short_name' => '');
 
-				foreach($components as $c)
+			foreach($components as $c)
+			{
+				if (isset($c['types']) AND in_array($key, $c['types']))
 				{
-					if (isset($c["types"]) AND in_array($key, $c["types"]))
+					if (isset($c['long_name']))
 					{
-						if (isset($c["long_name"]))
+						$return['long_name'] = $c['long_name'];
+						if ($single)
 						{
-							$return["long_name"] = $c["long_name"];
-							if ($single)
-							{
-								return $return["long_name"];
-							}
+							return $return['long_name'];
 						}
-						if (isset($c["short_name"]))
+					}
+					if (isset($c['short_name']))
+					{
+						$return['short_name'] = $c['short_name'];
+						if ($single)
 						{
-							$return["short_name"] = $c["short_name"];
-							if ($single)
-							{
-								return $return["long_name"];
-							}
+							return $return['long_name'];
 						}
-						return $return;
 					}
+					return $return;
 				}
-			');
+			}
+		};
 
 		$return = strtolower($return);
 		switch($return)
diff --git a/fuel/modules/fuel/tests/Google_helper_test.php b/fuel/modules/fuel/tests/Google_helper_test.php
index 12fb93fca..1f639830a 100644
--- a/fuel/modules/fuel/tests/Google_helper_test.php
+++ b/fuel/modules/fuel/tests/Google_helper_test.php
@@ -1,4 +1,4 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php  if (!defined('BASEPATH')) exit('No direct script access allowed');
 
 require_once('Fuel_test_base.php');
 
@@ -9,11 +9,11 @@
  * An open source Content Management System based on the
  * Codeigniter framework (http://codeigniter.com)
  *
- * @package        FUEL CMS
- * @author        David McReynolds @ Daylight Studio
- * @copyright    Copyright (c) 2018, Daylight Studio LLC.
- * @license        http://docs.getfuelcms.com/general/license
- * @link        http://www.getfuelcms.com
+ * @package		FUEL CMS
+ * @author		David McReynolds @ Daylight Studio
+ * @copyright	Copyright (c) 2018, Daylight Studio LLC.
+ * @license		http://docs.getfuelcms.com/general/license
+ * @link		http://www.getfuelcms.com
  * @filesource
  */
 
@@ -22,11 +22,11 @@
 /**
  * FUEL Google Helper Test
  *
- * @package        FUEL CMS
- * @subpackage    Helpers
- * @category    Helpers
- * @author        David McReynolds @ Daylight Studio
- * @link        http://docs.getfuelcms.com/helpers/format_helper
+ * @package		FUEL CMS
+ * @subpackage	Helpers
+ * @category	Helpers
+ * @author		David McReynolds @ Daylight Studio
+ * @link		http://docs.getfuelcms.com/helpers/format_helper
  */
 
 // ------------------------------------------------------------------------

From 2babd4aa7fa5f36761cc6241a1c59a4fdfaddeda Mon Sep 17 00:00:00 2001
From: David McReynolds <dave@thedaylightstudio.com>
Date: Mon, 26 Mar 2018 22:29:07 -0700
Subject: [PATCH 044/129] Fixed issue with file field and repeatable noclone

---
 fuel/modules/fuel/libraries/Fuel_custom_fields.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fuel/modules/fuel/libraries/Fuel_custom_fields.php b/fuel/modules/fuel/libraries/Fuel_custom_fields.php
index 5cbeedd02..026a96782 100644
--- a/fuel/modules/fuel/libraries/Fuel_custom_fields.php
+++ b/fuel/modules/fuel/libraries/Fuel_custom_fields.php
@@ -293,7 +293,7 @@ public function file($params)
 				{
 					$preview .= (isset($params['preview_label'])) ? $params['preview_label'] : $asset_path;
 				}
-				$preview .= '</a>';
+				$preview .= '</a></div>';
 			}
 
 		}

From f0e2a55d878a27d0aa692e49f6d7d23dd267b56f Mon Sep 17 00:00:00 2001
From: David McReynolds <dave@thedaylightstudio.com>
Date: Mon, 2 Apr 2018 09:45:42 -0700
Subject: [PATCH 045/129] Fix for issue 467

---
 fuel/modules/fuel/libraries/Fuel_blocks.php | 11 +++++++++--
 fuel/modules/fuel/libraries/Fuel_pages.php  |  6 ------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/fuel/modules/fuel/libraries/Fuel_blocks.php b/fuel/modules/fuel/libraries/Fuel_blocks.php
index 64bc889a6..d466c2c93 100644
--- a/fuel/modules/fuel/libraries/Fuel_blocks.php
+++ b/fuel/modules/fuel/libraries/Fuel_blocks.php
@@ -241,12 +241,19 @@ public function render($params, $vars = array(), $check_db = TRUE, $scope = NULL
 						$p['parse'] = TRUE;
 					}
 
-					$view = $block->view;
+					// we'll get the raw view variable so we can parse it later
+					$block_vars = $block->values();
+					$view = $block_vars['view'];
+
+					// this can cause parsing error because it is automatically parsed
+					// https://github.com/daylightstudio/FUEL-CMS/issues/467
+					//$view = $block->view;
 
 					if ($p['editable'] === TRUE)
 					{
 						$view = fuel_edit($block->id, 'Edit Block: '.$block->name, 'blocks').$view;
 					}
+
 				}
 				else if (file_exists($view_file))
 				{
@@ -270,7 +277,7 @@ public function render($params, $vars = array(), $check_db = TRUE, $scope = NULL
 		}
 
 		// parse the view again to apply any variables from previous parse
-		$output = ($p['parse'] === TRUE) ? $this->CI->parser->parse_string($view, $vars, TRUE) : $view;
+		$output = ($p['parse'] === TRUE) ? $this->CI->fuel->parser->parse_string($view, $vars, TRUE) : $view;
 
 		if ($p['cache'] === TRUE)
 		{
diff --git a/fuel/modules/fuel/libraries/Fuel_pages.php b/fuel/modules/fuel/libraries/Fuel_pages.php
index 2b46a7639..624ea1847 100644
--- a/fuel/modules/fuel/libraries/Fuel_pages.php
+++ b/fuel/modules/fuel/libraries/Fuel_pages.php
@@ -801,9 +801,6 @@ public function render($return = FALSE, $fuelify = TRUE)
 	 */
 	public function cms_render($return = FALSE, $fuelify = FALSE)
 	{
-
-		$this->CI->load->library('parser');
-
 		// render template with page variables if data exists
 		if (!empty($this->layout))
 		{
@@ -984,9 +981,6 @@ public function variables_render($return = FALSE, $fuelify = FALSE)
 			// load the file so we can parse it 
 			if (!empty($vars['parse_view']))
 			{
-				// load here to save on execution time... 
-				$this->CI->load->library('parser');
-				
 				$body = file_get_contents($check_file);
 
 				// now parse any template like syntax

From 7d8886f08d7d9d1ab3c6786871f4109f1836597a Mon Sep 17 00:00:00 2001
From: David McReynolds <dave@thedaylightstudio.com>
Date: Mon, 2 Apr 2018 09:45:42 -0700
Subject: [PATCH 046/129] Fix for issue #467

---
 fuel/modules/fuel/libraries/Fuel_blocks.php | 11 +++++++++--
 fuel/modules/fuel/libraries/Fuel_pages.php  |  6 ------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/fuel/modules/fuel/libraries/Fuel_blocks.php b/fuel/modules/fuel/libraries/Fuel_blocks.php
index 64bc889a6..d466c2c93 100644
--- a/fuel/modules/fuel/libraries/Fuel_blocks.php
+++ b/fuel/modules/fuel/libraries/Fuel_blocks.php
@@ -241,12 +241,19 @@ public function render($params, $vars = array(), $check_db = TRUE, $scope = NULL
 						$p['parse'] = TRUE;
 					}
 
-					$view = $block->view;
+					// we'll get the raw view variable so we can parse it later
+					$block_vars = $block->values();
+					$view = $block_vars['view'];
+
+					// this can cause parsing error because it is automatically parsed
+					// https://github.com/daylightstudio/FUEL-CMS/issues/467
+					//$view = $block->view;
 
 					if ($p['editable'] === TRUE)
 					{
 						$view = fuel_edit($block->id, 'Edit Block: '.$block->name, 'blocks').$view;
 					}
+
 				}
 				else if (file_exists($view_file))
 				{
@@ -270,7 +277,7 @@ public function render($params, $vars = array(), $check_db = TRUE, $scope = NULL
 		}
 
 		// parse the view again to apply any variables from previous parse
-		$output = ($p['parse'] === TRUE) ? $this->CI->parser->parse_string($view, $vars, TRUE) : $view;
+		$output = ($p['parse'] === TRUE) ? $this->CI->fuel->parser->parse_string($view, $vars, TRUE) : $view;
 
 		if ($p['cache'] === TRUE)
 		{
diff --git a/fuel/modules/fuel/libraries/Fuel_pages.php b/fuel/modules/fuel/libraries/Fuel_pages.php
index 2b46a7639..624ea1847 100644
--- a/fuel/modules/fuel/libraries/Fuel_pages.php
+++ b/fuel/modules/fuel/libraries/Fuel_pages.php
@@ -801,9 +801,6 @@ public function render($return = FALSE, $fuelify = TRUE)
 	 */
 	public function cms_render($return = FALSE, $fuelify = FALSE)
 	{
-
-		$this->CI->load->library('parser');
-
 		// render template with page variables if data exists
 		if (!empty($this->layout))
 		{
@@ -984,9 +981,6 @@ public function variables_render($return = FALSE, $fuelify = FALSE)
 			// load the file so we can parse it 
 			if (!empty($vars['parse_view']))
 			{
-				// load here to save on execution time... 
-				$this->CI->load->library('parser');
-				
 				$body = file_get_contents($check_file);
 
 				// now parse any template like syntax

From be1270db8014128fa3cb9bf888c72ae1fa0209df Mon Sep 17 00:00:00 2001
From: David McReynolds <dave@thedaylightstudio.com>
Date: Tue, 3 Apr 2018 10:14:02 -0700
Subject: [PATCH 047/129] Set proper status code for 404 redirected template

---
 fuel/modules/fuel/libraries/Fuel_redirects.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fuel/modules/fuel/libraries/Fuel_redirects.php b/fuel/modules/fuel/libraries/Fuel_redirects.php
index 1274a7b0c..88a0c006b 100644
--- a/fuel/modules/fuel/libraries/Fuel_redirects.php
+++ b/fuel/modules/fuel/libraries/Fuel_redirects.php
@@ -451,6 +451,7 @@ public function execute($show_404 = TRUE, $only_passive = TRUE)
 
 			if (!empty($error_404))
 			{
+				set_status_header(404);
 				echo $error_404;
 				exit();
 			}

From a4ea32eec35c6c452a01cf0a786383eb345140c3 Mon Sep 17 00:00:00 2001
From: David McReynolds <dave@thedaylightstudio.com>
Date: Mon, 9 Apr 2018 12:29:53 -0700
Subject: [PATCH 048/129] =?UTF-8?q?A=20couple=20PHP=207.2=20fixes=20?=
 =?UTF-8?q?=E2=80=A6=20more=20to=20come?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fuel/modules/fuel/libraries/Form.php      | 2 +-
 fuel/modules/fuel/libraries/Menu.php      | 4 ++++
 fuel/modules/fuel/libraries/Validator.php | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/fuel/modules/fuel/libraries/Form.php b/fuel/modules/fuel/libraries/Form.php
index 22da460c4..be15d53bb 100644
--- a/fuel/modules/fuel/libraries/Form.php
+++ b/fuel/modules/fuel/libraries/Form.php
@@ -64,7 +64,7 @@ public function __construct($params = array())
 	 */
 	public function initialize($params = array())
 	{
-		if (count($params) > 0)
+		if ($params AND count($params) > 0)
 		{
 			foreach ($params as $key => $val)
 			{
diff --git a/fuel/modules/fuel/libraries/Menu.php b/fuel/modules/fuel/libraries/Menu.php
index 62b987793..e656788ac 100644
--- a/fuel/modules/fuel/libraries/Menu.php
+++ b/fuel/modules/fuel/libraries/Menu.php
@@ -673,6 +673,10 @@ protected function _render_page_title($menu)
 		}
 
 		$str = '';
+		if (is_null($this->_active_items))
+		{
+			$this->_active_items = array();
+		}
 		$num = count($this->_active_items) -1;
 		$home_link = '';
 		if (!empty($this->home_link)){
diff --git a/fuel/modules/fuel/libraries/Validator.php b/fuel/modules/fuel/libraries/Validator.php
index c759a1b2a..2c3659ec0 100644
--- a/fuel/modules/fuel/libraries/Validator.php
+++ b/fuel/modules/fuel/libraries/Validator.php
@@ -63,7 +63,7 @@ public function __construct ($params = array()) {
 			$CI->load->helper('validator');
 		}
 	
-		if (count($params) > 0)
+		if ($params AND count($params) > 0)
 		{
 			$this->initialize($params);
 		}

From 56dc99773ab99bab842390c98c423f009a48c3e8 Mon Sep 17 00:00:00 2001
From: David McReynolds <dave@thedaylightstudio.com>
Date: Wed, 18 Apr 2018 11:12:27 -0700
Subject: [PATCH 049/129] Updated order of Validator add_rules docblock
 parameters

---
 fuel/modules/fuel/libraries/Validator.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fuel/modules/fuel/libraries/Validator.php b/fuel/modules/fuel/libraries/Validator.php
index 2c3659ec0..a2113ff40 100644
--- a/fuel/modules/fuel/libraries/Validator.php
+++ b/fuel/modules/fuel/libraries/Validator.php
@@ -115,8 +115,8 @@ function set_params($params)
 	 *
 	 * @access public
 	 * @param string key in processing array to assign to rule. Often times its the same name as the field input
-	 * @param string error message
 	 * @param string function for processing
+	 * @param string error message
 	 * @param mixed function arguments with the first usually being the posted value. If multiple arguments need to be passed, then you can use an array.
 	 * @return void
 	 */

From 462631ee0dbf19c69c092ea34f9a2da6b29bc04d Mon Sep 17 00:00:00 2001
From: David McReynolds <dave@thedaylightstudio.com>
Date: Wed, 18 Apr 2018 13:24:47 -0700
Subject: [PATCH 050/129] Changed create_func to functions for 7.2
 compatability

---
 fuel/modules/fuel/config/fuel_modules.php     |  27 +--
 fuel/modules/fuel/controllers/Module.php      | 108 ++++-------
 fuel/modules/fuel/controllers/Pages.php       |   2 +-
 fuel/modules/fuel/helpers/markdown_helper.php |   8 +-
 fuel/modules/fuel/libraries/Asset.php         |  19 +-
 fuel/modules/fuel/libraries/Data_table.php    |  46 ++---
 fuel/modules/fuel/libraries/Form_builder.php  | 155 ++++++++-------
 .../fuel/libraries/Fuel_custom_fields.php     | 178 +++++++++---------
 fuel/modules/fuel/libraries/Fuel_pages.php    |  10 +-
 .../libraries/parser/Fuel_dwoo_parser.php     |  32 ++--
 .../modules/fuel/models/Base_module_model.php |  12 +-
 .../fuel/views/_docs/general/forms.php        |   2 +-
 12 files changed, 276 insertions(+), 323 deletions(-)

diff --git a/fuel/modules/fuel/config/fuel_modules.php b/fuel/modules/fuel/config/fuel_modules.php
index eef64a2ed..485446973 100644
--- a/fuel/modules/fuel/config/fuel_modules.php
+++ b/fuel/modules/fuel/config/fuel_modules.php
@@ -275,21 +275,22 @@
 	'table_actions' => array(
 		'EDIT',
 		'DELETE' => array(
-			'func' => create_function('$cols', '
-				if ($cols[\'super_admin\'] != "yes") { 
-					$CI =& get_instance();
-					$link = "";
-					if ($CI->fuel->auth->has_permission($CI->permission, "delete") && isset($cols[$CI->model->key_field()]))
-					{
-						$url = site_url("/".$CI->config->item("fuel_path", "fuel").$CI->module_uri."/delete/".$cols[$CI->model->key_field()]);
-						$link = "<a href=\"".$url."\">".lang("table_action_delete")."</a>";
-						$link .= " <input type=\"checkbox\" name=\"delete[".$cols[$CI->model->key_field()]."]\" value=\"1\" id=\"delete_".$cols[$CI->model->key_field()]."\" class=\"multi_delete\"/>";
+			'func' => function($cols){
+					if ($cols['super_admin'] != "yes") { 
+						$CI =& get_instance();
+						$link = "";
+						if ($CI->fuel->auth->has_permission($CI->permission, "delete") && isset($cols[$CI->model->key_field()]))
+						{
+							$url = site_url("/".$CI->config->item("fuel_path", "fuel").$CI->module_uri."/delete/".$cols[$CI->model->key_field()]);
+							$link = "<a href=\"".$url."\">".lang("table_action_delete")."</a>";
+							$link .= " <input type=\"checkbox\" name=\"delete[".$cols[$CI->model->key_field()]."]\" value=\"1\" id=\"delete_".$cols[$CI->model->key_field()]."\" class=\"multi_delete\"/>";
+						}
+						return $link;
 					}
-					return $link;
-				}')
+				}
 			),
 		'LOGIN' => array(
-			'func' => create_function('$cols', '
+			'func' => function($cols){
 				$CI =& get_instance();
 				$link = "";
 				$user = $CI->fuel->auth->user_data();
@@ -299,7 +300,7 @@
 					$link = "<a href=\"".$url."\">".lang("table_action_login_as")."</a>";
 				}
 				return $link;
-				'),
+				},
 			),
 		),
 	'item_actions' => array('save', 'activate', 'duplicate', 'create', 'delete'),
diff --git a/fuel/modules/fuel/controllers/Module.php b/fuel/modules/fuel/controllers/Module.php
index d8b9df3be..ef90709ed 100644
--- a/fuel/modules/fuel/controllers/Module.php
+++ b/fuel/modules/fuel/controllers/Module.php
@@ -316,45 +316,21 @@ function items()
 			$has_delete_permission = $this->fuel->auth->has_permission($this->permission, "delete") ? '1' : '0';
 
 			// set data table actions... look first for item_actions set in the fuel_modules
-			/*$edit_func = '
-			$CI =& get_instance();
-			$link = "";';
+			$delete_func = function($cols) use ($has_delete_permission) {
+				$CI =& get_instance();
+				$link = "";
 
-			if ($has_edit_permission)
-			{
-				$edit_func .= 'if (isset($cols[$CI->model->key_field()]))
-				{	
-					echo  $cols[$CI->model->limit_to_user_field];
-					if (empty($CI->model->limit_to_user_field) OR (!empty($CI->model->limit_to_user_field) AND (!empty($cols[$CI->model->limit_to_user_field])) AND $cols[$CI->model->limit_to_user_field] = $CI->fuel->auth->user_data("id")))
+				if ($has_delete_permission)
+				{
+					if (!empty($cols[$CI->model->key_field()]))
 					{
-						$url = fuel_url("'.$this->module_uri.'/edit/".$cols[$CI->model->key_field()]);
+						$url = fuel_url("'.$this->module_uri.'/delete/".$cols[$CI->model->key_field()]);
 						$link = "<a href=\"".$url."\" class=\"action_delete\">".lang("table_action_delete")."</a>";
 						$link .= " <input type=\"checkbox\" name=\"delete[".$cols[$CI->model->key_field()]."]\" value=\"1\" id=\"delete_".$cols[$CI->model->key_field()]."\" class=\"multi_delete\"/>";
 					}
-				}';	
-			}
-
-			$edit_func .= 'return $link;';
-
-			$edit_func = create_function('$cols', $edit_func);*/
-
-			// set data table actions... look first for item_actions set in the fuel_modules
-			$delete_func = '
-			$CI =& get_instance();
-			$link = "";';
-
-			if ($has_delete_permission)
-			{
-				$delete_func .= 'if (!empty($cols[$CI->model->key_field()]))
-				{
-					$url = fuel_url("'.$this->module_uri.'/delete/".$cols[$CI->model->key_field()]);
-					$link = "<a href=\"".$url."\" class=\"action_delete\">".lang("table_action_delete")."</a>";
-					$link .= " <input type=\"checkbox\" name=\"delete[".$cols[$CI->model->key_field()]."]\" value=\"1\" id=\"delete_".$cols[$CI->model->key_field()]."\" class=\"multi_delete\"/>";
-				}';				
-			}
-
-			$delete_func .= 'return $link;';
-			$delete_func = create_function('$cols', $delete_func);
+				}
+				return $link;
+			};
 
 			foreach($this->table_actions as $key => $val)
 			{
@@ -444,39 +420,34 @@ function items()
 			$has_publish_permission = ($this->fuel->auth->has_permission($this->permission, 'publish')) ? '1' : '0';
 			$has_edit_permission = $this->fuel->auth->has_permission($this->permission, 'edit') ? '1' : '0';
 
-			$no = lang("form_enum_option_no");
-			$yes = lang("form_enum_option_yes");
-			$col_txt = lang('click_to_toggle');
-			$key_field = $this->model->key_field();
-
-			$_publish_toggle_callback = '
-			$can_publish = (($heading == "published" OR $heading == "active") AND '.$has_publish_permission.' OR
+			$_publish_toggle_callback = function($cols, $heading) {
+				$can_publish = (($heading == "published" OR $heading == "active") AND '.$has_publish_permission.' OR
 				(($heading != "published" AND $heading != "active") AND '.$has_edit_permission.'));
 
-			$no = "'.$no.'";
-			$yes = "'.$yes.'";
-			$col_txt = "'.$col_txt.'";
+				$no = lang("form_enum_option_no");
+				$yes = lang("form_enum_option_yes");
+				$col_txt = lang('click_to_toggle');
+				$key_field = $this->model->key_field();
 
-			// boolean fields
-			if (is_null($cols[$heading]) OR $cols[$heading] == "")
-			{
-				return "";
-			}
-			else if (!is_true_val($cols[$heading]))
-			{
-				$text_class = ($can_publish) ? "publish_text unpublished toggle_on" : "unpublished";
-				$action_class = ($can_publish) ? "publish_action unpublished hidden" : "unpublished hidden";
-				return \'<span class="publish_hover"><span class="\'.$text_class.\'" id="row_published_\'.$cols["'.$key_field.'"].\'" data-field="\'.$heading.\'">\'.$no.\'</span><span class="\'.$action_class.\'">\'.$col_txt.\'</span></span>\';
-			}
-			else
-			{
-				$text_class = ($can_publish) ? "publish_text published toggle_off" : "published";
-				$action_class = ($can_publish) ? "publish_action published hidden" : "published hidden";
-				return \'<span class="publish_hover"><span class="\'.$text_class.\'" id="row_published_\'.$cols["'.$key_field.'"].\'" data-field="\'.$heading.\'">\'.$yes.\'</span><span class="\'.$action_class.\'">\'.$col_txt.\'</span></span>\';
-				
-			}';
-
-			$_publish_toggle_callback = create_function('$cols, $heading', $_publish_toggle_callback);
+				// boolean fields
+				if (is_null($cols[$heading]) OR $cols[$heading] == "")
+				{
+					return "";
+				}
+				else if (!is_true_val($cols[$heading]))
+				{
+					$text_class = ($can_publish) ? "publish_text unpublished toggle_on" : "unpublished";
+					$action_class = ($can_publish) ? "publish_action unpublished hidden" : "unpublished hidden";
+					return '<span class="publish_hover"><span class="'.$text_class.'" id="row_published_'.$cols[$key_field].'" data-field="'.$heading.'">'.$no.'</span><span class="'.$action_class.'">'.$col_txt.'</span></span>';
+				}
+				else
+				{
+					$text_class = ($can_publish) ? "publish_text published toggle_off" : "published";
+					$action_class = ($can_publish) ? "publish_action published hidden" : "published hidden";
+					return '<span class="publish_hover"><span class="'.$text_class.'" id="row_published_'.$cols[$key_field].'" data-field="'.$heading.'">'.$yes.'</span><span class="'.$action_class.'">'.$col_txt.'</span></span>';
+					
+				}
+			};
 
 			foreach($boolean_fields as $bool)
 			{
@@ -1487,7 +1458,7 @@ protected function _process()
 		$this->_orig_post = $_POST;
 
 		// filter placeholder $_POST values 
-		$callback = create_function('$matches', '
+		$callback = function($matches){
 			if (isset($_POST[$matches["2"]]))
 			{
 				$str = $matches[1].$_POST[$matches["2"]].$matches[3];
@@ -1497,7 +1468,7 @@ protected function _process()
 				$str = $matches[0];
 			}
 			return $str;
-		');
+		};
 
 		// first loop through and create simple non-namespaced $_POST values if they don't exist for convenience'
 		foreach($_POST as $key => $val)
@@ -2260,13 +2231,14 @@ protected function _process_uploads($posted = NULL)
 					if (strpos($field_value, '{') !== FALSE )
 					{
 						//e modifier is deprecated so we have to do this
-						$callback = create_function('$match', '
+						$callback = function($match){
 								$return = "";
 								if (!empty($match[2]))
 								{
 									$return = $match[1].$GLOBALS["__tmp_transient_posted__"][$match[2]].$match[3];
 								}
-								return $return;');
+								return $return;
+							};
 
 						// hacky but avoids 5.3 function syntax (which is nicer but doesn't work with 5.2)
 						$GLOBALS['__tmp_transient_posted__'] = $posted;
diff --git a/fuel/modules/fuel/controllers/Pages.php b/fuel/modules/fuel/controllers/Pages.php
index f7dc5f3bb..28b085b0b 100644
--- a/fuel/modules/fuel/controllers/Pages.php
+++ b/fuel/modules/fuel/controllers/Pages.php
@@ -921,7 +921,7 @@ public function select()
 		// apply filter
 		if ( ! empty($filter))
 		{
-			$filter_callback = create_function('$a', 'return preg_match(\'#^'.$filter.'$#\', $a);');
+			$filter_callback = function($a) use ($filter) { return preg_match('#^'.$filter.'$#', $a); };
 			if (!empty($has_pdfs))
 			{
 				$options[lang('page_select_pages')] = array_filter($options[lang('page_select_pages')], $filter_callback);
diff --git a/fuel/modules/fuel/helpers/markdown_helper.php b/fuel/modules/fuel/helpers/markdown_helper.php
index 5a763725f..55d5ab84f 100644
--- a/fuel/modules/fuel/helpers/markdown_helper.php
+++ b/fuel/modules/fuel/helpers/markdown_helper.php
@@ -1628,9 +1628,13 @@ function _initDetab() {
 	# regular expression.
 	#
 		if (function_exists($this->utf8_strlen)) return;
-		$this->utf8_strlen = create_function('$text', 'return preg_match_all(
+
+		// Changed 2018-04-17 David McReynolds to make PHP 7.2 compliant
+		$this->utf8_strlen = function($text) {
+			return preg_match_all(
 			"/[\\\\x00-\\\\xBF]|[\\\\xC0-\\\\xFF][\\\\x80-\\\\xBF]*/", 
-			$text, $m);');
+			$text, $m);
+		};
 	}
 
 
diff --git a/fuel/modules/fuel/libraries/Asset.php b/fuel/modules/fuel/libraries/Asset.php
index 5e0408370..23f7563f3 100644
--- a/fuel/modules/fuel/libraries/Asset.php
+++ b/fuel/modules/fuel/libraries/Asset.php
@@ -711,11 +711,10 @@ public function js($path, $module = '', $options = array())
 		// if the path is an associative array, than we assume the key is the module
 		if (is_array($path))
 		{
-			$path_arr = each($path);
-			if (!is_numeric($path_arr['key']))
+			if (!is_numeric(key($path)))
 			{
-				$module = $path_arr['key'];
-				$path = $path_arr['value'];
+				$module = key($path);
+				$path = current($path);
 			}
 		}
 		
@@ -810,11 +809,10 @@ public function css($path, $module = '', $options = array())
 		// if the path is an associative array, than we assume the key is the module
 		if (is_array($path))
 		{
-			$path_arr = each($path);
-			if (!is_numeric($path_arr['key']))
+			if (!is_numeric(key($path)))
 			{
-				$module = $path_arr['key'];
-				$path = $path_arr['value'];
+				$module = key($path);
+				$path = current($path);
 			}
 		}
 		
@@ -1429,13 +1427,14 @@ public function optimize($files, $params = array())
 					}
 				}
 
-				$callback = create_function('$matches', '
+				$callback = function($matches) {
 					if (isset($matches[2]))
 					{
 						return $GLOBALS["__TMP_CSS_IMPORT__"][$matches[2]];	
 					} else {
 						return "";
-					}');
+					}
+				};
 
 				// remove calls to the import since they are combined into the same css
 				if (!empty($import_files))
diff --git a/fuel/modules/fuel/libraries/Data_table.php b/fuel/modules/fuel/libraries/Data_table.php
index f45da2ca1..ac9119821 100644
--- a/fuel/modules/fuel/libraries/Data_table.php
+++ b/fuel/modules/fuel/libraries/Data_table.php
@@ -532,17 +532,16 @@ public function reset()
 
 	<pre class="brush: php">
 	// with a function
-	$delete_func = '
-	$CI =& get_instance();
-	$link = "";
-	if ($CI->auth->has_permission("delete"))
-	{
-		$url = site_url("example/delete/".$cols["id"]);
-		$link = "<a href=\"".$url."\">DELETE</a>";
-	}
-	return $link;';
-
-	$delete_func = create_function('$cols', $delete_func);
+	$delete_func = function($cols){
+		$CI =& get_instance();
+		$link = "";
+		if ($CI->auth->has_permission("delete"))
+		{
+			$url = site_url("example/delete/".$cols["id"]);
+			$link = "<a href=\"".$url."\">DELETE</a>";
+		}
+		return $link;
+	};
 	$this->data_table->add_action($field, $action);
 	</code>
 	 * @access	public
@@ -799,13 +798,14 @@ public function add_row($columns = array(), $attrs = array(), $index = NULL, $ac
 				{
 
 					//e modifier is deprecated so we have to do this
-					$callback = create_function('$match', '
+					$callback = function($match){
 							$return = $match[0];
 							if (!empty($match[2]))
 							{
 								$return = $match[1].$GLOBALS["__tmp_transient_columns__"][$match[2]].$match[3];
 							}
-							return $return;');
+							return $return;
+						};
 
 					// hacky but avoids 5.3 function syntax (which is nicer but doesn't work with 5.2)
 					$GLOBALS['__tmp_transient_columns__'] = $columns;
@@ -929,19 +929,15 @@ protected function _render_actions($actions, $fields)
 			}
 			else
 			{
-				//e modifier is deprecated so we have to do this
-				$callback = create_function('$match', '
+				$url = preg_replace_callback('#^(.*)\{(.+)\}(.*)$#', function($match) use ($fields) {
 						$return = "";
 	
-						if (!empty($match[2]) && !empty($GLOBALS["__tmp_transient_fields__"][$match[2]]))
+						if (!empty($match[2]) && !empty($fields[$match[2]]))
 						{
-							$return = $match[1].$GLOBALS["__tmp_transient_fields__"][$match[2]].$match[3];
+							$return = $match[1].$fields[$match[2]].$match[3];
 						}
-						return $return;');
-
-				// hacky but avoids 5.3 function syntax (which is nicer but doesn't work with 5.2)
-				$GLOBALS['__tmp_transient_fields__'] = $fields;
-				$url = preg_replace_callback('#^(.*)\{(.+)\}(.*)$#', $callback, $val['url']);
+						return $return;
+				}, $val['url']);
 				
 				if (!empty($url))
 				{
@@ -951,12 +947,6 @@ protected function _render_actions($actions, $fields)
 			}
 		}
 
-		// hacky cleanup to avoid using 5.3 syntax
-		if (isset($GLOBALS["__tmp_transient_fields__"]))
-		{
-			unset($GLOBALS["__tmp_transient_fields__"]);
-		}
-
 		if (!empty($actions)) $str = implode('&nbsp; '.$this->action_delimiter.'  &nbsp;', $actions);
 		return $str;
 	}
diff --git a/fuel/modules/fuel/libraries/Form_builder.php b/fuel/modules/fuel/libraries/Form_builder.php
index f73e0eb2d..be59772db 100644
--- a/fuel/modules/fuel/libraries/Form_builder.php
+++ b/fuel/modules/fuel/libraries/Form_builder.php
@@ -1631,7 +1631,7 @@ public function create_field($params, $normalize = TRUE)
 					$str = '';
 					break;
 				case 'custom':
-					$func = (isset($params['func'])) ? $params['func'] : create_function('$params', 'return (isset($params["value"])) ? $params["value"] : "" ;');
+					$func = (isset($params['func'])) ? $params['func'] : function($params) { return (isset($params["value"])) ? $params["value"] : "" ; };
 					$str = $this->create_custom($func, $params);
 					break;
 				default : 
@@ -2459,15 +2459,52 @@ public function create_time($params)
 
 		$process_key = $params[$key];
 
-		// create post processer to recreate date value
-$func_str = '
-			if (is_array($value))
-			{
-				foreach($value as $key => $val)
+		
+		// needed for post processing
+		if (!empty($_POST) AND !isset($_POST[$params['key']]))
+		{
+			$_POST[$time_params['name']] = '';
+		}
+
+		if (empty($params['is_datetime']))
+		{
+			// create post processer to recreate date value
+			$func = function($value) use ($process_key){
+				if (is_array($value))
+				{
+					foreach($value as $key => $val)
+					{
+						$hr   = (isset($val[$process_key]) AND (int)$val[$process_key] > 0 AND (int)$val[$process_key] < 24) ? $val[$process_key] : "";
+						$min  = (isset($val[$process_key.'_min']) AND is_numeric($val[$process_key.'_min']))  ? $val[$process_key.'_min'] : "00";
+						$ampm = (isset($val[$process_key.'_am_pm']) AND $hr AND $min) ? $val[$process_key.'_am_pm'] : "";
+						if (!empty($ampm) AND !empty($hr) AND $hr > 12)
+						{
+							if ($hr > 24) 
+							{
+								$hr = "00";
+							}
+							else
+							{
+								$hr = (int) $hr - 12;
+								$ampm = "pm";
+							}
+						}
+
+						if (empty($hr))
+						{
+							$hr = "00";
+						}
+
+						$dateval = $hr.":".$min.$ampm;
+						$value[$key][$process_key] = date("H:i:s", strtotime($dateval));
+					}
+					return $value;
+				}
+				else
 				{
-					$hr   = (isset($val["'.$process_key.'"]) AND (int)$val["'.$process_key.'"] > 0 AND (int)$val["'.$process_key.'"] < 24) ? $val["'.$process_key.'"] : "";
-					$min  = (isset($val["'.$process_key.'_min"]) AND is_numeric($val["'.$process_key.'_min"]))  ? $val["'.$process_key.'_min"] : "00";
-					$ampm = (isset($val["'.$process_key.'_am_pm"]) AND $hr AND $min) ? $val["'.$process_key.'_am_pm"] : "";
+					$hr    = (isset($_POST[$process_key]) AND (int)$_POST[$process_key] > 0 AND (int)$_POST[$process_key] < 24) ? $_POST[$process_key] : "";
+					$min   = (isset($_POST[$process_key.'_min']) AND is_numeric($_POST[$process_key.'_min']))  ? $_POST[$process_key.'_min'] : "00";
+					$ampm  = (isset($_POST[$process_key.'_am_pm']) AND $hr AND $min) ? $_POST[$process_key.'_am_pm'] : "";
 					if (!empty($ampm) AND !empty($hr) AND $hr > 12)
 					{
 						if ($hr > 24) 
@@ -2487,48 +2524,10 @@ public function create_time($params)
 					}
 
 					$dateval = $hr.":".$min.$ampm;
-					$value[$key]["'.$process_key.'"] = date("H:i:s", strtotime($dateval));
-				}
-				return $value;
-			}
-			else
-			{
-				$hr    = (isset($_POST["'.$process_key.'"]) AND (int)$_POST["'.$process_key.'"] > 0 AND (int)$_POST["'.$process_key.'"] < 24) ? $_POST["'.$process_key.'"] : "";
-				$min   = (isset($_POST["'.$process_key.'_min"]) AND is_numeric($_POST["'.$process_key.'_min"]))  ? $_POST["'.$process_key.'_min"] : "00";
-				$ampm  = (isset($_POST["'.$process_key.'_am_pm"]) AND $hr AND $min) ? $_POST["'.$process_key.'_am_pm"] : "";
-				if (!empty($ampm) AND !empty($hr) AND $hr > 12)
-				{
-					if ($hr > 24) 
-					{
-						$hr = "00";
-					}
-					else
-					{
-						$hr = (int) $hr - 12;
-						$ampm = "pm";
-					}
-				}
-
-				if (empty($hr))
-				{
-					$hr = "00";
+					$dateval = date("H:i:s", strtotime($dateval));
+					return $dateval;
 				}
-
-				$dateval = $hr.":".$min.$ampm;
-				$dateval = date("H:i:s", strtotime($dateval));
-				return $dateval;
-			}
-		';
-		
-		// needed for post processing
-		if (!empty($_POST) AND !isset($_POST[$params['key']]))
-		{
-			$_POST[$time_params['name']] = '';
-		}
-
-		if (empty($params['is_datetime']))
-		{
-			$func = create_function('$value', $func_str);
+			};
 			$this->set_post_process($params['key'], $func);
 		}
 		return $str;
@@ -2567,27 +2566,26 @@ public function create_datetime($params)
 
 		$process_key = (isset($params['subkey'])) ? $params['subkey'] : $params['key'];
 
-		$func_str = '
-				
-				if (is_array($value))
+		$func = function($value) use ($process_key) {
+			if (is_array($value))
 				{
 					foreach($value as $key => $val)
 					{
-						if (isset($val["'.$process_key.'"]))
+						if (isset($val[$process_key]))
 						{
 
-							$date = (!empty($val["'.$process_key.'"]) AND is_date_format($val["'.$process_key.'"])) ? current(explode(" ", $val["'.$process_key.'"])) : "";
-							$hr   = (!empty($val["'.$process_key.'_hour"]) AND  (int)$val["'.$process_key.'_hour"] > 0 AND (int)$val["'.$process_key.'_hour"] < 24) ? $val["'.$process_key.'_hour"] : "";
-							$min  = (!empty($val["'.$process_key.'_min"]) AND is_numeric($val["'.$process_key.'_min"]))  ? $val["'.$process_key.'_min"] : "00";
-							$ampm = (isset($val["'.$process_key.'_am_pm"]) AND $hr AND $min) ? $val["'.$process_key.'_am_pm"] : "";
+							$date = (!empty($val[$process_key]) AND is_date_format($val[$process_key])) ? current(explode(" ", $val[$process_key])) : "";
+							$hr   = (!empty($val[$process_key.'_hour']) AND  (int)$val[$process_key.'_hour'] > 0 AND (int)$val[$process_key.'_hour'] < 24) ? $val[$process_key.'_hour'] : "";
+							$min  = (!empty($val[$process_key.'_min']) AND is_numeric($val[$process_key.'_min']))  ? $val[$process_key.'_min'] : "00";
+							$ampm = (isset($val[$process_key.'_am_pm']) AND $hr AND $min) ? $val[$process_key.'_am_pm'] : "";
 							
 
-							if (is_string($val["'.$process_key.'"]))
+							if (is_string($val[$process_key]))
 							{
-								$date = (!empty($val["'.$process_key.'"]) AND is_date_format($val["'.$process_key.'"])) ? current(explode(" ", $val["'.$process_key.'"])) : "";
-								$hr   = (!empty($val["'.$process_key.'_hour"]) AND  (int)$val["'.$process_key.'_hour"] > 0 AND (int)$val["'.$process_key.'_hour"] < 24) ? $val["'.$process_key.'_hour"] : "";
-								$min  = (!empty($val["'.$process_key.'_min"]) AND is_numeric($val["'.$process_key.'_min"]))  ? $val["'.$process_key.'_min"] : "00";
-								$ampm = (isset($val["'.$process_key.'_am_pm"]) AND $hr AND $min) ? $val["'.$process_key.'_am_pm"] : "";
+								$date = (!empty($val[$process_key]) AND is_date_format($val[$process_key])) ? current(explode(" ", $val[$process_key])) : "";
+								$hr   = (!empty($val[$process_key.'_hour']) AND  (int)$val[$process_key.'_hour'] > 0 AND (int)$val[$process_key.'_hour'] < 24) ? $val[$process_key.'_hour'] : "";
+								$min  = (!empty($val[$process_key.'_min']) AND is_numeric($val[$process_key.'_min']))  ? $val[$process_key.'_min'] : "00";
+								$ampm = (isset($val[$process_key.'_am_pm']) AND $hr AND $min) ? $val[$process_key.'_am_pm'] : "";
 
 								if (!empty($ampm) AND !empty($hr) AND $hr > 12)
 								{
@@ -2602,22 +2600,22 @@ public function create_datetime($params)
 									}
 								}
 
-								$dateval = current(explode(" ", $value[$key]["'.$process_key.'"]));
+								$dateval = current(explode(" ", $value[$key][$process_key]));
 								if ($date != "")
 								{
 									if (!empty($hr)) $dateval .= " ".$hr.":".$min.$ampm;
 								}
 								if (!empty($dateval))
 								{
-									$value[$key]["'.$process_key.'"] = $dateval;	
+									$value[$key][$process_key] = $dateval;	
 								}
 							}
-							else if (is_array($val["'.$process_key.'"]) AND isset($val["'.$process_key.'"]["'.$params['name'].'"]))
+							else if (is_array($val[$process_key]) AND isset($val[$process_key][$params['name']]))
 							{
-								$date = (!empty($val["'.$process_key.'"]["'.$params['name'].'"]) AND is_date_format($val["'.$process_key.'"]["'.$params['name'].'"])) ? current(explode(" ", $val["'.$process_key.'"]["'.$params['name'].'"])) : "";
-								$hr   = (isset($val["'.$process_key.'"]["'.$params['name'].'_hour"]) AND  (int)$val["'.$process_key.'"]["'.$params['name'].'_hour"] >= 0 AND (int)$val["'.$process_key.'"]["'.$params['name'].'_hour"] < 24) ? $val["'.$process_key.'"]["'.$params['name'].'_hour"] : "";
-								$min  = (!empty($val["'.$process_key.'"]["'.$params['name'].'_min"]) AND is_numeric($val["'.$process_key.'"]["'.$params['name'].'_min"]))  ? $val["'.$process_key.'"]["'.$params['name'].'_min"] : "00";
-								$ampm = (isset($val["'.$process_key.'"]["'.$params['name'].'_am_pm"]) AND $hr AND $min) ? $val["'.$process_key.'"]["'.$params['name'].'_am_pm"] : "";
+								$date = (!empty($val[$process_key][$params['name']]) AND is_date_format($val[$process_key][$params['name']])) ? current(explode(" ", $val[$process_key][$params['name']])) : "";
+								$hr   = (isset($val[$process_key][$params['name'].'_hour']) AND  (int)$val[$process_key][$params['name'].'_hour'] >= 0 AND (int)$val[$process_key][$params['name'].'_hour'] < 24) ? $val[$process_key][$params['name'].'_hour'] : "";
+								$min  = (!empty($val[$process_key][$params['name'].'_min']) AND is_numeric($val[$process_key][$params['name'].'_min']))  ? $val[$process_key][$params['name'].'_min'] : "00";
+								$ampm = (isset($val[$process_key][$params['name'].'_am_pm']) AND $hr AND $min) ? $val[$process_key][$params['name'].'_am_pm'] : "";
 
 								if (!empty($ampm) AND !empty($hr) AND $hr > 12)
 								{
@@ -2638,14 +2636,14 @@ public function create_datetime($params)
 									$ampm = "am";
 								}
 
-								$dateval = current(explode(" ", $value[$key]["'.$process_key.'"]["'.$params['name'].'"]));
+								$dateval = current(explode(" ", $value[$key][$process_key][$params['name']]));
 								if ($date != "")
 								{
 									if ($hr !== "") $dateval .= " ".$hr.":".$min.$ampm;
 								}
 								if (!empty($dateval))
 								{
-									$value[$key]["'.$process_key.'"]["'.$params['name'].'"] = $dateval;	
+									$value[$key][$process_key][$params['name']] = $dateval;	
 								}
 							}
 						}
@@ -2655,10 +2653,10 @@ public function create_datetime($params)
 				}
 				else
 				{
-					$date  = (!empty($_POST["'.$process_key.'"]) AND is_date_format($_POST["'.$process_key.'"])) ? current(explode(" ", $_POST["'.$process_key.'"])) : "";
-					$hr    = (isset($_POST["'.$process_key.'_hour"]) AND (int)$_POST["'.$process_key.'_hour"] >= 0 AND (int)$_POST["'.$process_key.'_hour"] < 24) ? $_POST["'.$process_key.'_hour"] : "";
-					$min   = (!empty($_POST["'.$process_key.'_min"]) AND is_numeric($_POST["'.$process_key.'_min"]))  ? $_POST["'.$process_key.'_min"] : "00";
-					$ampm  = (isset($_POST["'.$process_key.'_am_pm"]) AND $hr AND $min) ? $_POST["'.$process_key.'_am_pm"] : "";
+					$date  = (!empty($_POST[$process_key]) AND is_date_format($_POST[$process_key])) ? current(explode(" ", $_POST[$process_key])) : "";
+					$hr    = (isset($_POST[$process_key.'_hour']) AND (int)$_POST[$process_key.'_hour'] >= 0 AND (int)$_POST[$process_key.'_hour'] < 24) ? $_POST[$process_key.'_hour'] : "";
+					$min   = (!empty($_POST[$process_key.'_min']) AND is_numeric($_POST[$process_key.'_min']))  ? $_POST[$process_key.'_min'] : "00";
+					$ampm  = (isset($_POST[$process_key.'_am_pm']) AND $hr AND $min) ? $_POST[$process_key.'_am_pm'] : "";
 
 					if (!empty($ampm) AND !empty($hr) AND $hr > 12)
 					{
@@ -2694,9 +2692,8 @@ public function create_datetime($params)
 
 					return $dateval;
 				}
-			';
 
-		$func = create_function('$value', $func_str);
+		};
 		$this->set_post_process($params['key'], $func);
 		return $str;
 	}
@@ -3578,7 +3575,7 @@ protected function _normalize_process_func($process, $value)
 		// shorthand if the function name is remove or clear, then we return an empty string
 		if ($func == 'remove' OR $func == 'clear')
 		{
-			$func = create_function('$value', 'return "";');
+			$func = function($value){ return ""; };
 		}
 		
 		return array('func' => $func, 'params' => $params);
diff --git a/fuel/modules/fuel/libraries/Fuel_custom_fields.php b/fuel/modules/fuel/libraries/Fuel_custom_fields.php
index 026a96782..acbe9c47a 100644
--- a/fuel/modules/fuel/libraries/Fuel_custom_fields.php
+++ b/fuel/modules/fuel/libraries/Fuel_custom_fields.php
@@ -518,46 +518,46 @@ public function asset($params)
 			$process_key = (isset($params['subkey'])) ? $params['subkey'] : $params['key'];
 
 			// create an array with the key being the image name and the value being the caption (if it exists... otherwise the image name is used again)
-			$func_str = '
+			$func = function($value) use ($process_key, $params) {
 				if (is_array($value))
 				{
 					foreach($value as $key => $val)
 					{
-						if (isset($val["'.$process_key.'"]))
+						if (isset($val[$process_key]))
 						{
 							$z = "";
-							if (is_string($val["'.$process_key.'"]))
+							if (is_string($val[$process_key]))
 							{
-								$z = $val["'.$process_key.'"];
+								$z = $val[$process_key];
 							}
-							else if (is_array($val["'.$process_key.'"]) AND isset($val["'.$process_key.'"]["'.$params['name'].'"]))
+							else if (is_array($val[$process_key]) AND isset($val[$process_key][$params['name']]))
 							{
-								$z = $val["'.$process_key.'"]["'.$params['name'].'"];
+								$z = $val[$process_key][$params['name']];
 							}
 							$z = trim($z);
 							$assets = array();
 							$assets_arr = preg_split("#\s*,\s*|\n#", $z);
 
-							if (is_string($val["'.$process_key.'"]))
+							if (is_string($val[$process_key]))
 							{
 								if (count($assets_arr) > 1)
 								{
-									$value[$key]["'.$process_key.'"] = json_encode($assets_arr);
+									$value[$key][$process_key] = json_encode($assets_arr);
 								}
 								else
 								{
-									$value[$key]["'.$process_key.'"] = $z;
+									$value[$key][$process_key] = $z;
 								}
 							}
-							else if (is_array($val["'.$process_key.'"]) AND isset($val["'.$process_key.'"]["'.$params['name'].'"]))
+							else if (is_array($val[$process_key]) AND isset($val[$process_key][$params['name']]))
 							{
 								if (count($assets_arr) > 1)
 								{
-									$value[$key]["'.$process_key.'"]["'.$params['name'].'"] = json_encode($assets_arr);
+									$value[$key][$process_key][$params['name']] = json_encode($assets_arr);
 								}
 								else
 								{
-									$value[$key]["'.$process_key.'"]["'.$params['name'].'"] = $z;
+									$value[$key][$process_key][$params['name']] = $z;
 								}
 							}
 							
@@ -578,10 +578,9 @@ public function asset($params)
 						return $value;
 					}
 				}
-				';
-			
-
-			$func = create_function('$value', $func_str);$form_builder->set_post_process($params['key'], $func);
+				
+			};
+			$form_builder->set_post_process($params['key'], $func);
 		}
 		
 		// unserialize value if it's serialized
@@ -1004,26 +1003,26 @@ public function template($params, $return_fields = FALSE)
 
 		if (!empty($params['serialize']))
 		{
-			
-			$func_str = '$CI =& get_instance();
-			$val = $CI->input->post("'.$params['key'].'");
-			if (isset($_POST["'.$params['key'].'"]) AND is_array($val))
-			{
-				//return serialize($val); // issues with multibyte characters
-				// foreach($_POST["'.$params['key'].'"] as $key => $val)
-				// {
-				// 	$CI->form_builder->post_process_field_values($val);
-				// }
-				return json_encode($val);
-			}
-			else
-			{
-				$_POST["'.$params['key'].'"] = "";
-				return "";
-			}
-			';
 
-			$func = create_function('$value', $func_str);
+
+			$func = function($value) use ($params) {
+				$CI =& get_instance();
+				$val = $CI->input->post($params['key']);
+				if (isset($_POST[$params['key']]) AND is_array($val))
+				{
+					//return serialize($val); // issues with multibyte characters
+					// foreach($_POST["'.$params['key'].'"] as $key => $val)
+					// {
+					// 	$CI->form_builder->post_process_field_values($val);
+					// }
+					return json_encode($val);
+				}
+				else
+				{
+					$_POST[$params['key']] = "";
+					return "";
+				}
+			};
 			$form_builder->set_post_process($params['key'], $func);
 		}
 		
@@ -1256,22 +1255,23 @@ public function currency($params)
 
 		$process_key = (isset($params['subkey'])) ? $params['subkey'] : $params['key'];
 
-		// check if it's a nested form
-		$func_str = '
+		// unformat number
+		$func = function($value) use ($process_key, $params) {
+			// check if it's a nested form
 			if (is_array($value))
 			{
 				foreach($value as $key => $val)
 				{
-					if (isset($val["'.$process_key.'"]))
+					if (isset($val[$process_key]))
 					{
 						$z = "";
-						if (is_string($val["'.$process_key.'"]))
+						if (is_string($val[$process_key]))
 						{
-							$z = $val["'.$process_key.'"];
+							$z = $val[$process_key];
 						}
-						else if (is_array($val["'.$process_key.'"]) AND isset($val["'.$process_key.'"]["'.$params['name'].'"]))
+						else if (is_array($val[$process_key]) AND isset($val[$process_key][$params['name']]))
 						{
-							$z = $val["'.$process_key.'"]["'.$params['name'].'"];
+							$z = $val[$process_key][$params['name']];
 						}
 
 						if ($z == "")
@@ -1280,23 +1280,23 @@ public function currency($params)
 						}
 						else
 						{
-							$value_parts = explode("'.$params['decimal'].'", $z);
+							$value_parts = explode($params['decimal'], $z);
 							$curval = current($value_parts);
 							$decimal = "00";
 							if (count($value_parts) > 1)
 							{
 								$decimal = end($value_parts);
 							}
-							$curval = str_replace("'.$params['separator'].'", "", $curval);
+							$curval = str_replace($params['separator'], "", $curval);
 							$curval = (float) $curval.".".$decimal;
 						}
-						if (is_string($val["'.$process_key.'"]))
+						if (is_string($val[$process_key]))
 						{
-							$value[$key]["'.$process_key.'"] = $curval;
+							$value[$key][$process_key] = $curval;
 						}
-						else if (is_array($val["'.$process_key.'"]) AND isset($val["'.$process_key.'"]["'.$params['name'].'"]))
+						else if (is_array($val[$process_key]) AND isset($val[$process_key][$params['name']]))
 						{
-							$value[$key]["'.$process_key.'"]["'.$params['name'].'"] = $curval;
+							$value[$key][$process_key][$params['name']] = $curval;
 						}
 						
 					}
@@ -1311,22 +1311,19 @@ public function currency($params)
 				}
 				else
 				{
-					$value_parts = explode("'.$params['decimal'].'", $value);
+					$value_parts = explode($params['decimal'], $value);
 					$value = current($value_parts);
 					$decimal = "00";
 					if (count($value_parts) > 1)
 					{
 						$decimal = end($value_parts);
 					}
-					$value = str_replace("'.$params['separator'].'", "", $value);
+					$value = str_replace($params['separator'], "", $value);
 					$value = (float) $value.".".$decimal;
 				}
 				return $value;
 			}
-			';
-		
-		// unformat number
-		$func = create_function('$value', $func_str);	
+		};
 		$form_builder->set_post_process($params['key'], $func);
 
 		// preformat the currency 
@@ -1407,22 +1404,22 @@ public function slug($params)
 
 		$process_key = (isset($params['subkey'])) ? $params['subkey'] : $params['key'];
 
-		$func_str = '
+		$func = function($value) use ($process_key, $params) {
 			if (is_array($value))
 			{
 				foreach($value as $key => $val)
 				{
 
-					if (isset($val["'.$params['linked_to'].'"]))
+					if (isset($val[$params['linked_to']]))
 					{
-						$v = url_title($val["'.$params['linked_to'].'"], "dash", TRUE);
-						if (is_string($val["'.$process_key.'"]))
+						$v = url_title($val[$params['linked_to']], "dash", TRUE);
+						if (is_string($val[$process_key]))
 						{
-							$value[$key]["'.$process_key.'"] = $v;
+							$value[$key][$process_key] = $v;
 						}
-						else if (is_array($val["'.$process_key.'"]) AND isset($val["'.$process_key.'"]["'.$params['name'].'"]))
+						else if (is_array($val[$process_key]) AND isset($val[$process_key][$params['name']]))
 						{
-							$value[$key]["'.$process_key.'"]["'.$params['name'].'"] = $v;
+							$value[$key][$process_key][$params['name']] = $v;
 						}
 						
 					}
@@ -1432,16 +1429,15 @@ public function slug($params)
 			else
 			{
 				$CI =& get_instance();
-				$slug_val = $CI->input->post("'.$params['name'].'");
-				$linked_value = $CI->input->post("'.$params['linked_to'].'");
+				$slug_val = $CI->input->post($params['name']);
+				$linked_value = $CI->input->post($params['linked_to']);
 				if ( ! $slug_val AND $linked_value)
 				{
 					return url_title($linked_value, "dash", TRUE);
 				}
 				return $slug_val;
 			}
-			';
-		$func = create_function('$value', $func_str);
+		};
 		$form_builder->set_post_process($params['key'], $func);
 		
 		$params['type'] = 'text';
@@ -1472,32 +1468,32 @@ public function list_items($params)
 
 		$list_type = (!empty($params['list_type']) AND $params['list_type'] == 'ol') ? 'ol' : 'ul';
 
-		$func_str = '
+		$func = function($value) use ($process_key, $params, $output_class, $list_type){
 			if (is_array($value))
 			{
 				foreach($value as $key => $val)
 				{
-					if (isset($val["'.$process_key.'"]))
+					if (isset($val[$process_key]))
 					{
 						$z = "";
-						if (is_string($val["'.$process_key.'"]))
+						if (is_string($val[$process_key]))
 						{
-							$z = $val["'.$process_key.'"];
+							$z = $val[$process_key];
 						}
-						else if (is_array($val["'.$process_key.'"]) AND isset($val["'.$process_key.'"]["'.$params['name'].'"]))
+						else if (is_array($val[$process_key]) AND isset($val[$process_key][$params['name']]))
 						{
-							$z = $val["'.$process_key.'"]["'.$params['name'].'"];
+							$z = $val[$process_key][$params['name']];
 						}
 						$lis = explode("\n", $z);
 						$lis = array_map("trim", $lis);
-						$newval = '.$list_type.'($lis, "'.$output_class.'");
-						if (is_string($val["'.$process_key.'"]))
+						$newval = $list_type($lis, $output_class);
+						if (is_string($val[$process_key]))
 						{
-							$value[$key]["'.$process_key.'"] = $newval;
+							$value[$key][$process_key] = $newval;
 						}
-						else if (is_array($val["'.$process_key.'"]) AND isset($val["'.$process_key.'"]["'.$params['name'].'"]))
+						else if (is_array($val[$process_key]) AND isset($val[$process_key][$params['name']]))
 						{
-							$value[$key]["'.$process_key.'"]["'.$params['name'].'"] = $newval;
+							$value[$key][$process_key][$params['name']] = $newval;
 						}
 						
 					}
@@ -1510,10 +1506,8 @@ public function list_items($params)
 				$lis = array_map("trim", $lis);
 				return '.$list_type.'($lis, "'.$output_class.'");
 			}
-			';
-		
-		
-		$func = create_function('$value', $func_str);
+
+		};
 		$form_builder->set_post_process($params['key'], $func);
 		$params['class'] = 'no_editor';
 		return $form_builder->create_textarea($params);
@@ -1795,21 +1789,21 @@ public function keyval($params)
 
 	
 		// create an array with the key being the image name and the value being the caption (if it exists... otherwise the image name is used again)
-		$func_str = '
+		$func = function($value) use ($process_key, $params) {
 			if (is_array($value))
 			{
 				foreach($value as $key => $val)
 				{
-					if (isset($val["'.$process_key.'"]))
+					if (isset($val[$process_key]))
 					{
 						$z = "";
-						if (is_string($val["'.$process_key.'"]))
+						if (is_string($val[$process_key]))
 						{
-							$z = $val["'.$process_key.'"];
+							$z = $val[$process_key];
 						}
-						else if (is_array($val["'.$process_key.'"]) AND isset($val["'.$process_key.'"]["'.$params['name'].'"]))
+						else if (is_array($val[$process_key]) AND isset($val[$process_key][$params['name']]))
 						{
-							$z = $val["'.$process_key.'"]["'.$params['name'].'"];
+							$z = $val[$process_key][$params['name']];
 						}
 
 						$json = array();
@@ -1829,13 +1823,13 @@ public function keyval($params)
 							}
 						}
 						$first_item = current($json);
-						if (is_string($val["'.$process_key.'"]))
+						if (is_string($val[$process_key]))
 						{
-							$value[$key]["'.$process_key.'"] = (!empty($first_item)) ? json_encode($json) : "";
+							$value[$key][$process_key] = (!empty($first_item)) ? json_encode($json) : "";
 						}
-						else if (is_array($val["'.$process_key.'"]) AND isset($val["'.$process_key.'"]["'.$params['name'].'"]))
+						else if (is_array($val[$process_key]) AND isset($val[$process_key][$params['name']]))
 						{
-							$value[$key]["'.$process_key.'"]["'.$params['name'].'"] = (!empty($first_item)) ? json_encode($json) : "";
+							$value[$key][$process_key][$params['name']] = (!empty($first_item)) ? json_encode($json) : "";
 						}
 					}
 				}
@@ -1870,8 +1864,8 @@ public function keyval($params)
 					return  (!empty($first_item)) ? json_encode($json) : "";
 				}
 			}
-			';
-		$func = create_function('$value', $func_str);
+
+		};
 		$form_builder->set_post_process($params['key'], $func);
 
 		if (!empty($params['value']))
diff --git a/fuel/modules/fuel/libraries/Fuel_pages.php b/fuel/modules/fuel/libraries/Fuel_pages.php
index 624ea1847..92d66c58a 100644
--- a/fuel/modules/fuel/libraries/Fuel_pages.php
+++ b/fuel/modules/fuel/libraries/Fuel_pages.php
@@ -1328,11 +1328,7 @@ public function render_all_markers($output)
 		{	
 
 			// move all edit markers in attributes to before the node
-			$callback = create_function(
-			            // single quotes are essential here,
-			            // or alternative escape all $ as \$
-			            '$matches',
-			            '
+			$callback = function($matches){
 						$CI =& get_instance();
 						$marker_reg_ex = $CI->fuel->page->get_marker_regex();
 						$output = $matches[0];
@@ -1343,8 +1339,8 @@ public function render_all_markers($output)
 							$output = $CI->fuel->page->remove_markers($matches[0]);
 							$output = implode($tagmatches[0], " ").$output;
 						}
-						return $output;'
-			        );
+						return $output;
+			        };
 
 			$output = preg_replace_callback('#<[^>]+=["\'][^<]*'.$marker_reg_ex.'.*(?<!--)>#Ums', $callback, $output);
 			//$output = preg_replace('#(=["\'][^<]*)('.$marker_reg_ex.')#Ums', '${2}${1}', $output);  // doesn't work with fuel_var in multiple tag attributes
diff --git a/fuel/modules/fuel/libraries/parser/Fuel_dwoo_parser.php b/fuel/modules/fuel/libraries/parser/Fuel_dwoo_parser.php
index f17d116cb..1fc923f0a 100644
--- a/fuel/modules/fuel/libraries/parser/Fuel_dwoo_parser.php
+++ b/fuel/modules/fuel/libraries/parser/Fuel_dwoo_parser.php
@@ -107,14 +107,14 @@ public function _parse($string, $data, $return = FALSE)
 				
 				//Add a pre-processor to help fix javascript {}
 				// added by David McReynolds @ Daylight Studio 11/04/10
-				$callback = create_function('$compiler', '
+				$callback = function($compiler) use ($l_delim) {
 					$string = $compiler->getTemplateSource();
 					
-					$callback = create_function(\'$matches\',
-						\'if (isset($matches[1]))
+					$callback = function($matches){
+						if (isset($matches[1]))
 						{
 							$str = "<script";
-							$str .= preg_replace("#\\'.$l_delim.'([^s])#ms", "'.$l_delim.' $1", $matches[1]);
+							$str .= preg_replace('#'.$l_delim.'([^s])#ms', $l_delim.' $1', $matches[1]);
 							$str .= "</script>";
 							return $str;
 						}
@@ -122,13 +122,12 @@ public function _parse($string, $data, $return = FALSE)
 						{
 							return $matches[0];
 						}
-						\'
-						);
+					};
 
 					$string = preg_replace_callback("#<script(.+)</script>#Ums", $callback, $string);
 					$compiler->setTemplateSource($string);
 					return $string;
-				');
+				};
 				$compiler->addPreProcessor($callback);
 
 				// render the template
@@ -197,21 +196,21 @@ public function php_to_syntax($str)
 		$str = preg_replace('#'.$l_delim.'\s*foreach\s*\((\$\w+)\s+as\s+\$(\w+)\s*(=>\s*\$(\w+))?\)\s*'.$r_delim.'#U', $l_delim.'foreach $1 $2 $4'.$r_delim, $str); // with and without keys
 
 		// remove !empty
-		$callback = create_function('$matches', '
+		$callback = function($matches) use ($l_delim) {
 			if (!empty($matches[2]))
 			{
-				return "'.$l_delim.'".$matches[1].$matches[3];
+				return $l_delim.$matches[1].$matches[3];
 			}
 			else
 			{
-				return "'.$l_delim.'".$matches[1]."!".$matches[3];
-			}');
+				return $l_delim.$matches[1]."!".$matches[3];
+			}
+		};
 		
 		$str = preg_replace_callback('#'.$l_delim.'(.+)(!)\s*?empty\((.+)\)#U', $callback, $str);
 		
 		// remove parenthesis from within if conditional
-		//$callback2 = create_function('$matches', 'return str_replace(array("(", ")"), array(" ", ""), $matches[0]);');
-		$callback2 = create_function('$matches', '
+		$callback2 = function($matches) {
 			$CI =& get_instance();
 			$allowed_funcs = $CI->fuel->config("parser_allowed_functions");
 			$str = $matches[0];
@@ -228,11 +227,12 @@ public function php_to_syntax($str)
 			// now replace any other parenthesis
 			$str = str_replace(array("(", ")"), array(" ", ""), $str);
 			$str = str_replace(array($ldlim, $rdlim), array("(", ")"), $str);
-			return $str;');
+			return $str;
+		};
 		
 		$str = preg_replace_callback('#'.$l_delim.'if.+'.$r_delim.'#U', $callback2, $str);
 		// fix arrays
-		$callback = create_function('$matches', '
+		$callback = function($matches){
 			if (strstr($matches[0], "=>"))
 			{
 				$key_vals = explode(",", $matches[0]);
@@ -247,7 +247,7 @@ public function php_to_syntax($str)
 				return $return;
 			}
 			return $matches[0];
-			');
+			};
 		
 		$str = preg_replace_callback('#(array\()(.+)(\))#U', $callback, $str);
 		return $str;
diff --git a/fuel/modules/fuel/models/Base_module_model.php b/fuel/modules/fuel/models/Base_module_model.php
index 7445ca8b3..d72f9842d 100644
--- a/fuel/modules/fuel/models/Base_module_model.php
+++ b/fuel/modules/fuel/models/Base_module_model.php
@@ -1212,20 +1212,20 @@ public function get_embedded_list_items($params, $list_cols = array(), $actions
 			foreach($params['tooltip_char_limit'] as $field => $limit)
 			{
 				$limit = (int) $limit;
-				$tooltip_func_str = ' 
-						$value = strip_tags($values["'.$field.'"]);
- 						if (strlen($value) > '.$limit.')
+				$tooltip_func = function($values) use ($field) {
+					$value = strip_tags($values[$field]);
+ 						if (strlen($value) > $limit)
 						{
 							// display tooltip for long notes
-							$trimmed = character_limiter($value, '.$limit.');
+							$trimmed = character_limiter($value, $limit);
 							$data = "<span title=\"" . $value . "\" class=\"tooltip\">" . $trimmed . "</span>";
 						}
 						else
 						{
 							$data = $value;
 						}
-						return $data;';
-				$tooltip_func = create_function('$values', $tooltip_func_str);
+						return $data;
+				};
 				$data_table->add_field_formatter($field, $tooltip_func);
 			}
 			
diff --git a/fuel/modules/fuel/views/_docs/general/forms.php b/fuel/modules/fuel/views/_docs/general/forms.php
index 0cb231ea6..a97018b39 100644
--- a/fuel/modules/fuel/views/_docs/general/forms.php
+++ b/fuel/modules/fuel/views/_docs/general/forms.php
@@ -1317,6 +1317,6 @@ function my_custom_field($params)
 <h2 id="pre_post_processing">Pre &amp; Post Processing Fields</h2>
 <p>If you need a field that does additional processing before being set as the value of the field or after posting, you can create a pre-processing or post-processing function to handle it. 
 	To register that function with the field, you specify the <dfn>pre_process</dfn> or <dfn>post_process</dfn> parameter respectively.
-	The value assigned to the the pre/post_process parameters is the name of the function (as a string), a lambda function (from create_function), 
+	The value assigned to the the pre/post_process parameters is the name of the function (as a string), a lambda function, 
 	or an array with the first value being the instance of an object and the second value being the name of the method on that object. There are several
 	custom functions that take advantage of this feature including the <a href="#asset">asset</a>, <a href="#slug">slug</a> <a href="#template">template</a>, <a href="#currency">currency</a> and <a href="#keyval">keyval</a> field types.</p>
\ No newline at end of file

From c19575ac33967add33481fd8ea79d54c38da2487 Mon Sep 17 00:00:00 2001
From: David McReynolds <dave@thedaylightstudio.com>
Date: Wed, 18 Apr 2018 13:37:36 -0700
Subject: [PATCH 051/129] CI 3.1.8 update

---
 fuel/codeigniter/core/CodeIgniter.php         |  2 +-
 fuel/codeigniter/core/Security.php            | 18 +++++--
 .../codeigniter/database/DB_query_builder.php | 51 ++++++++++---------
 .../database/drivers/oci8/oci8_driver.php     | 15 +++++-
 .../drivers/postgre/postgre_driver.php        |  7 ++-
 fuel/codeigniter/libraries/Email.php          | 18 +++++--
 .../codeigniter/libraries/Form_validation.php |  2 +-
 fuel/codeigniter/libraries/Image_lib.php      |  5 +-
 fuel/codeigniter/libraries/Xmlrpc.php         |  2 +-
 9 files changed, 81 insertions(+), 39 deletions(-)

diff --git a/fuel/codeigniter/core/CodeIgniter.php b/fuel/codeigniter/core/CodeIgniter.php
index 962196b6b..4ad513dd6 100755
--- a/fuel/codeigniter/core/CodeIgniter.php
+++ b/fuel/codeigniter/core/CodeIgniter.php
@@ -55,7 +55,7 @@
  * @var	string
  *
  */
-	const CI_VERSION = '3.1.7';
+	const CI_VERSION = '3.1.8';
 
 /*
  * ------------------------------------------------------
diff --git a/fuel/codeigniter/core/Security.php b/fuel/codeigniter/core/Security.php
index 6cdce5d98..31926b466 100755
--- a/fuel/codeigniter/core/Security.php
+++ b/fuel/codeigniter/core/Security.php
@@ -134,7 +134,9 @@ class CI_Security {
 	 */
 	protected $_never_allowed_str =	array(
 		'document.cookie' => '[removed]',
+		'(document).cookie' => '[removed]',
 		'document.write'  => '[removed]',
+		'(document).write'  => '[removed]',
 		'.parentNode'     => '[removed]',
 		'.innerHTML'      => '[removed]',
 		'-moz-binding'    => '[removed]',
@@ -152,7 +154,7 @@ class CI_Security {
 	 */
 	protected $_never_allowed_regex = array(
 		'javascript\s*:',
-		'(document|(document\.)?window)\.(location|on\w*)',
+		'(\(?document\)?|\(?window\)?(\.document)?)\.(location|on\w*)',
 		'expression\s*(\(|&\#40;)', // CSS and IE
 		'vbscript\s*:', // IE, surprise!
 		'wscript\s*:', // IE
@@ -542,6 +544,14 @@ public function xss_clean($str, $is_image = FALSE)
 			$str
 		);
 
+		// Same thing, but for "tag functions" (e.g. eval`some code`)
+		// See https://github.com/bcit-ci/CodeIgniter/issues/5420
+		$str = preg_replace(
+			'#(alert|prompt|confirm|cmd|passthru|eval|exec|expression|system|fopen|fsockopen|file|file_get_contents|readfile|unlink)(\s*)`(.*?)`#si',
+			'\\1\\2&#96;\\3&#96;',
+			$str
+		);
+
 		// Final clean up
 		// This adds a bit of extra precaution in case
 		// something got through the above filters
@@ -853,7 +863,7 @@ protected function _sanitize_naughty_html($matches)
 		// For other tags, see if their attributes are "evil" and strip those
 		elseif (isset($matches['attributes']))
 		{
-			// We'll store the already fitlered attributes here
+			// We'll store the already filtered attributes here
 			$attributes = array();
 
 			// Attribute-catching pattern
@@ -927,7 +937,7 @@ protected function _js_link_removal($match)
 		return str_replace(
 			$match[1],
 			preg_replace(
-				'#href=.*?(?:(?:alert|prompt|confirm)(?:\(|&\#40;)|javascript:|livescript:|mocha:|charset=|window\.|document\.|\.cookie|<script|<xss|d\s*a\s*t\s*a\s*:)#si',
+				'#href=.*?(?:(?:alert|prompt|confirm)(?:\(|&\#40;|`|&\#96;)|javascript:|livescript:|mocha:|charset=|window\.|\(?document\)?\.|\.cookie|<script|<xss|d\s*a\s*t\s*a\s*:)#si',
 				'',
 				$this->_filter_attributes($match[1])
 			),
@@ -955,7 +965,7 @@ protected function _js_img_removal($match)
 		return str_replace(
 			$match[1],
 			preg_replace(
-				'#src=.*?(?:(?:alert|prompt|confirm|eval)(?:\(|&\#40;)|javascript:|livescript:|mocha:|charset=|window\.|document\.|\.cookie|<script|<xss|base64\s*,)#si',
+				'#src=.*?(?:(?:alert|prompt|confirm|eval)(?:\(|&\#40;|`|&\#96;)|javascript:|livescript:|mocha:|charset=|window\.|\(?document\)?\.|\.cookie|<script|<xss|base64\s*,)#si',
 				'',
 				$this->_filter_attributes($match[1])
 			),
diff --git a/fuel/codeigniter/database/DB_query_builder.php b/fuel/codeigniter/database/DB_query_builder.php
index b9bbb5016..8f477e3a1 100755
--- a/fuel/codeigniter/database/DB_query_builder.php
+++ b/fuel/codeigniter/database/DB_query_builder.php
@@ -680,7 +680,7 @@ protected function _wh($qb_key, $key, $value = NULL, $type = 'AND ', $escape = N
 			{
 				if ($escape === TRUE)
 				{
-					$v = ' '.$this->escape($v);
+					$v = $this->escape($v);
 				}
 
 				if ( ! $this->_has_operator($k))
@@ -698,10 +698,11 @@ protected function _wh($qb_key, $key, $value = NULL, $type = 'AND ', $escape = N
 				$k = substr($k, 0, $match[0][1]).($match[1][0] === '=' ? ' IS NULL' : ' IS NOT NULL');
 			}
 
-			$this->{$qb_key}[] = array('condition' => $prefix.$k.$v, 'escape' => $escape);
+			${$qb_key} = array('condition' => $prefix.$k, 'value' => $v, 'escape' => $escape);
+			$this->{$qb_key}[] = ${$qb_key};
 			if ($this->qb_caching === TRUE)
 			{
-				$this->{$qb_cache_key}[] = array('condition' => $prefix.$k.$v, 'escape' => $escape);
+				$this->{$qb_cache_key}[] = ${$qb_key};
 				$this->qb_cache_exists[] = substr($qb_key, 3);
 			}
 
@@ -834,6 +835,7 @@ protected function _where_in($key = NULL, $values = NULL, $not = FALSE, $type =
 
 		$where_in = array(
 			'condition' => $prefix.$key.$not.' IN('.implode(', ', $where_in).')',
+			'value' => NULL,
 			'escape' => $escape
 		);
 
@@ -962,33 +964,34 @@ protected function _like($field, $match = '', $type = 'AND ', $side = 'both', $n
 				$v = $this->escape_like_str($v);
 			}
 
-			if ($side === 'none')
+			switch ($side)
 			{
-				$like_statement = "{$prefix} {$k} {$not} LIKE '{$v}'";
-			}
-			elseif ($side === 'before')
-			{
-				$like_statement = "{$prefix} {$k} {$not} LIKE '%{$v}'";
-			}
-			elseif ($side === 'after')
-			{
-				$like_statement = "{$prefix} {$k} {$not} LIKE '{$v}%'";
-			}
-			else
-			{
-				$like_statement = "{$prefix} {$k} {$not} LIKE '%{$v}%'";
+				case 'none':
+					$v = "'{$v}'";
+					break;
+				case 'before':
+					$v = "%'{$v}'";
+					break;
+				case 'after':
+					$v = "'{$v}%'";
+					break;
+				case 'both':
+				default:
+					$v = "'%{$v}%'";
+					break;
 			}
 
 			// some platforms require an escape sequence definition for LIKE wildcards
 			if ($escape === TRUE && $this->_like_escape_str !== '')
 			{
-				$like_statement .= sprintf($this->_like_escape_str, $this->_like_escape_chr);
+				$v .= sprintf($this->_like_escape_str, $this->_like_escape_chr);
 			}
 
-			$this->qb_where[] = array('condition' => $like_statement, 'escape' => $escape);
+			$qb_where = array('condition' => "{$prefix} {$k} {$not} LIKE", 'value' => $v, 'escape' => $escape);
+			$this->qb_where[] = $qb_where;
 			if ($this->qb_caching === TRUE)
 			{
-				$this->qb_cache_where[] = array('condition' => $like_statement, 'escape' => $escape);
+				$this->qb_cache_where[] = $qb_where;
 				$this->qb_cache_exists[] = 'where';
 			}
 		}
@@ -1013,6 +1016,7 @@ public function group_start($not = '', $type = 'AND ')
 		$prefix = (count($this->qb_where) === 0 && count($this->qb_cache_where) === 0) ? '' : $type;
 		$where = array(
 			'condition' => $prefix.$not.str_repeat(' ', ++$this->qb_where_group_count).' (',
+			'value' => NULL,
 			'escape' => FALSE
 		);
 
@@ -1073,6 +1077,7 @@ public function group_end()
 		$this->qb_where_group_started = FALSE;
 		$where = array(
 			'condition' => str_repeat(' ', $this->qb_where_group_count--).')',
+			'value' => NULL,
 			'escape' => FALSE
 		);
 
@@ -1433,7 +1438,7 @@ public function count_all_results($table = '', $reset = TRUE)
 	// --------------------------------------------------------------------
 
 	/**
-	 * Get_Where
+	 * get_where()
 	 *
 	 * Allows the where clause, limit and offset to be added directly
 	 *
@@ -2395,7 +2400,7 @@ protected function _compile_wh($qb_key)
 				}
 				elseif ($this->{$qb_key}[$i]['escape'] === FALSE)
 				{
-					$this->{$qb_key}[$i] = $this->{$qb_key}[$i]['condition'];
+					$this->{$qb_key}[$i] = $this->{$qb_key}[$i]['condition'].(isset($this->{$qb_key}[$i]['value']) ? ' '.$this->{$qb_key}[$i]['value'] : '');
 					continue;
 				}
 
@@ -2434,7 +2439,7 @@ protected function _compile_wh($qb_key)
 						.' '.trim($matches[3]).$matches[4].$matches[5];
 				}
 
-				$this->{$qb_key}[$i] = implode('', $conditions);
+				$this->{$qb_key}[$i] = implode('', $conditions).(isset($this->{$qb_key}[$i]['value']) ? ' '.$this->{$qb_key}[$i]['value'] : '');
 			}
 
 			return ($qb_key === 'qb_having' ? "\nHAVING " : "\nWHERE ")
diff --git a/fuel/codeigniter/database/drivers/oci8/oci8_driver.php b/fuel/codeigniter/database/drivers/oci8/oci8_driver.php
index 1bd977390..b90db4bd2 100755
--- a/fuel/codeigniter/database/drivers/oci8/oci8_driver.php
+++ b/fuel/codeigniter/database/drivers/oci8/oci8_driver.php
@@ -97,7 +97,7 @@ class CI_DB_oci8_driver extends CI_DB {
 	 *
 	 * @var	bool
 	 */
-	public $limit_used;
+	public $limit_used = FALSE;
 
 	// --------------------------------------------------------------------
 
@@ -685,4 +685,17 @@ protected function _close()
 		oci_close($this->conn_id);
 	}
 
+	// --------------------------------------------------------------------
+
+	/**
+	 * We need to reset our $limit_used hack flag, so it doesn't propagate
+	 * to subsequent queries.
+	 *
+	 * @return	void
+	 */
+	protected function _reset_select()
+	{
+		$this->limit_used = FALSE;
+		parent::_reset_select();
+	}
 }
diff --git a/fuel/codeigniter/database/drivers/postgre/postgre_driver.php b/fuel/codeigniter/database/drivers/postgre/postgre_driver.php
index 7fb258abb..5779c8783 100755
--- a/fuel/codeigniter/database/drivers/postgre/postgre_driver.php
+++ b/fuel/codeigniter/database/drivers/postgre/postgre_driver.php
@@ -224,8 +224,8 @@ public function version()
 		 * and so we'll have to fall back to running a query in
 		 * order to get it.
 		 */
-		return isset($pg_version['server'])
-			? $this->data_cache['version'] = $pg_version['server']
+		return (isset($pg_version['server']) && preg_match('#^(\d+\.\d+)#', $pg_version['server'], $match))
+			? $this->data_cache['version'] = $match[1]
 			: parent::version();
 	}
 
@@ -354,8 +354,7 @@ public function affected_rows()
 	 */
 	public function insert_id()
 	{
-		$v = pg_version($this->conn_id);
-		$v = isset($v['server']) ? $v['server'] : 0; // 'server' key is only available since PosgreSQL 7.4
+		$v = $this->version();
 
 		$table	= (func_num_args() > 0) ? func_get_arg(0) : NULL;
 		$column	= (func_num_args() > 1) ? func_get_arg(1) : NULL;
diff --git a/fuel/codeigniter/libraries/Email.php b/fuel/codeigniter/libraries/Email.php
index 6a8bda70e..a53e7e72a 100755
--- a/fuel/codeigniter/libraries/Email.php
+++ b/fuel/codeigniter/libraries/Email.php
@@ -1035,7 +1035,7 @@ public function valid_email($email)
 		if (function_exists('idn_to_ascii') && strpos($email, '@'))
 		{
 			list($account, $domain) = explode('@', $email, 2);
-			$domain = is_php('5.4')
+			$domain = defined('INTL_IDNA_VARIANT_UTS46')
 				? idn_to_ascii($domain, 0, INTL_IDNA_VARIANT_UTS46)
 				: idn_to_ascii($domain);
 			$email = $account.'@'.$domain;
@@ -1856,7 +1856,7 @@ protected function _validate_email_for_shell(&$email)
 		if (function_exists('idn_to_ascii') && strpos($email, '@'))
 		{
 			list($account, $domain) = explode('@', $email, 2);
-			$domain = is_php('5.4')
+			$domain = defined('INTL_IDNA_VARIANT_UTS46')
 				? idn_to_ascii($domain, 0, INTL_IDNA_VARIANT_UTS46)
 				: idn_to_ascii($domain);
 			$email = $account.'@'.$domain;
@@ -2074,7 +2074,19 @@ protected function _smtp_connect()
 			$this->_send_command('hello');
 			$this->_send_command('starttls');
 
-			$crypto = stream_socket_enable_crypto($this->_smtp_connect, TRUE, STREAM_CRYPTO_METHOD_TLS_CLIENT);
+			/**
+			 * STREAM_CRYPTO_METHOD_TLS_CLIENT is quite the mess ...
+			 *
+			 * - On PHP <5.6 it doesn't even mean TLS, but SSL 2.0, and there's no option to use actual TLS
+			 * - On PHP 5.6.0-5.6.6, >=7.2 it means negotiation with any of TLS 1.0, 1.1, 1.2
+			 * - On PHP 5.6.7-7.1.* it means only TLS 1.0
+			 *
+			 * We want the negotiation, so we'll force it below ...
+			 */
+			$method = is_php('5.6')
+				? STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT | STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT | STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT
+				: STREAM_CRYPTO_METHOD_TLS_CLIENT;
+			$crypto = stream_socket_enable_crypto($this->_smtp_connect, TRUE, $method);
 
 			if ($crypto !== TRUE)
 			{
diff --git a/fuel/codeigniter/libraries/Form_validation.php b/fuel/codeigniter/libraries/Form_validation.php
index 3444c65a0..6a97ee599 100755
--- a/fuel/codeigniter/libraries/Form_validation.php
+++ b/fuel/codeigniter/libraries/Form_validation.php
@@ -1231,7 +1231,7 @@ public function valid_email($str)
 	{
 		if (function_exists('idn_to_ascii') && preg_match('#\A([^@]+)@(.+)\z#', $str, $matches))
 		{
-			$domain = is_php('5.4')
+			$domain = defined('INTL_IDNA_VARIANT_UTS46')
 				? idn_to_ascii($matches[2], 0, INTL_IDNA_VARIANT_UTS46)
 				: idn_to_ascii($matches[2]);
 			$str = $matches[1].'@'.$domain;
diff --git a/fuel/codeigniter/libraries/Image_lib.php b/fuel/codeigniter/libraries/Image_lib.php
index b9adcd6e5..a5cb6fb47 100755
--- a/fuel/codeigniter/libraries/Image_lib.php
+++ b/fuel/codeigniter/libraries/Image_lib.php
@@ -835,7 +835,10 @@ public function image_process_gd($action = 'resize')
 		imagedestroy($dst_img);
 		imagedestroy($src_img);
 
-		chmod($this->full_dst_path, $this->file_permissions);
+		if ($this->dynamic_output !== TRUE)
+		{
+			chmod($this->full_dst_path, $this->file_permissions);
+		}
 
 		return TRUE;
 	}
diff --git a/fuel/codeigniter/libraries/Xmlrpc.php b/fuel/codeigniter/libraries/Xmlrpc.php
index 39e4dd37e..c23504de8 100755
--- a/fuel/codeigniter/libraries/Xmlrpc.php
+++ b/fuel/codeigniter/libraries/Xmlrpc.php
@@ -1181,7 +1181,7 @@ public function parseResponse($fp)
 		$data = implode("\r\n", $lines);
 
 		// Parse XML data
-		if ( ! xml_parse($parser, $data, count($data)))
+		if ( ! xml_parse($parser, $data, TRUE))
 		{
 			$errstr = sprintf('XML error: %s at line %d',
 						xml_error_string(xml_get_error_code($parser)),

From 8e4b9f6eedc2cda9911947023d7e777e5ff813d4 Mon Sep 17 00:00:00 2001
From: David McReynolds <dave@thedaylightstudio.com>
Date: Wed, 18 Apr 2018 13:37:36 -0700
Subject: [PATCH 052/129] CI 3.1.8 update

---
 fuel/codeigniter/core/CodeIgniter.php         |  2 +-
 fuel/codeigniter/core/Security.php            | 18 +++++--
 .../codeigniter/database/DB_query_builder.php | 51 ++++++++++---------
 .../database/drivers/oci8/oci8_driver.php     | 15 +++++-
 .../drivers/postgre/postgre_driver.php        |  7 ++-
 fuel/codeigniter/libraries/Email.php          | 18 +++++--
 .../codeigniter/libraries/Form_validation.php |  2 +-
 fuel/codeigniter/libraries/Image_lib.php      |  5 +-
 fuel/codeigniter/libraries/Xmlrpc.php         |  2 +-
 9 files changed, 81 insertions(+), 39 deletions(-)

diff --git a/fuel/codeigniter/core/CodeIgniter.php b/fuel/codeigniter/core/CodeIgniter.php
index 962196b6b..4ad513dd6 100755
--- a/fuel/codeigniter/core/CodeIgniter.php
+++ b/fuel/codeigniter/core/CodeIgniter.php
@@ -55,7 +55,7 @@
  * @var	string
  *
  */
-	const CI_VERSION = '3.1.7';
+	const CI_VERSION = '3.1.8';
 
 /*
  * ------------------------------------------------------
diff --git a/fuel/codeigniter/core/Security.php b/fuel/codeigniter/core/Security.php
index 6cdce5d98..31926b466 100755
--- a/fuel/codeigniter/core/Security.php
+++ b/fuel/codeigniter/core/Security.php
@@ -134,7 +134,9 @@ class CI_Security {
 	 */
 	protected $_never_allowed_str =	array(
 		'document.cookie' => '[removed]',
+		'(document).cookie' => '[removed]',
 		'document.write'  => '[removed]',
+		'(document).write'  => '[removed]',
 		'.parentNode'     => '[removed]',
 		'.innerHTML'      => '[removed]',
 		'-moz-binding'    => '[removed]',
@@ -152,7 +154,7 @@ class CI_Security {
 	 */
 	protected $_never_allowed_regex = array(
 		'javascript\s*:',
-		'(document|(document\.)?window)\.(location|on\w*)',
+		'(\(?document\)?|\(?window\)?(\.document)?)\.(location|on\w*)',
 		'expression\s*(\(|&\#40;)', // CSS and IE
 		'vbscript\s*:', // IE, surprise!
 		'wscript\s*:', // IE
@@ -542,6 +544,14 @@ public function xss_clean($str, $is_image = FALSE)
 			$str
 		);
 
+		// Same thing, but for "tag functions" (e.g. eval`some code`)
+		// See https://github.com/bcit-ci/CodeIgniter/issues/5420
+		$str = preg_replace(
+			'#(alert|prompt|confirm|cmd|passthru|eval|exec|expression|system|fopen|fsockopen|file|file_get_contents|readfile|unlink)(\s*)`(.*?)`#si',
+			'\\1\\2&#96;\\3&#96;',
+			$str
+		);
+
 		// Final clean up
 		// This adds a bit of extra precaution in case
 		// something got through the above filters
@@ -853,7 +863,7 @@ protected function _sanitize_naughty_html($matches)
 		// For other tags, see if their attributes are "evil" and strip those
 		elseif (isset($matches['attributes']))
 		{
-			// We'll store the already fitlered attributes here
+			// We'll store the already filtered attributes here
 			$attributes = array();
 
 			// Attribute-catching pattern
@@ -927,7 +937,7 @@ protected function _js_link_removal($match)
 		return str_replace(
 			$match[1],
 			preg_replace(
-				'#href=.*?(?:(?:alert|prompt|confirm)(?:\(|&\#40;)|javascript:|livescript:|mocha:|charset=|window\.|document\.|\.cookie|<script|<xss|d\s*a\s*t\s*a\s*:)#si',
+				'#href=.*?(?:(?:alert|prompt|confirm)(?:\(|&\#40;|`|&\#96;)|javascript:|livescript:|mocha:|charset=|window\.|\(?document\)?\.|\.cookie|<script|<xss|d\s*a\s*t\s*a\s*:)#si',
 				'',
 				$this->_filter_attributes($match[1])
 			),
@@ -955,7 +965,7 @@ protected function _js_img_removal($match)
 		return str_replace(
 			$match[1],
 			preg_replace(
-				'#src=.*?(?:(?:alert|prompt|confirm|eval)(?:\(|&\#40;)|javascript:|livescript:|mocha:|charset=|window\.|document\.|\.cookie|<script|<xss|base64\s*,)#si',
+				'#src=.*?(?:(?:alert|prompt|confirm|eval)(?:\(|&\#40;|`|&\#96;)|javascript:|livescript:|mocha:|charset=|window\.|\(?document\)?\.|\.cookie|<script|<xss|base64\s*,)#si',
 				'',
 				$this->_filter_attributes($match[1])
 			),
diff --git a/fuel/codeigniter/database/DB_query_builder.php b/fuel/codeigniter/database/DB_query_builder.php
index b9bbb5016..8f477e3a1 100755
--- a/fuel/codeigniter/database/DB_query_builder.php
+++ b/fuel/codeigniter/database/DB_query_builder.php
@@ -680,7 +680,7 @@ protected function _wh($qb_key, $key, $value = NULL, $type = 'AND ', $escape = N
 			{
 				if ($escape === TRUE)
 				{
-					$v = ' '.$this->escape($v);
+					$v = $this->escape($v);
 				}
 
 				if ( ! $this->_has_operator($k))
@@ -698,10 +698,11 @@ protected function _wh($qb_key, $key, $value = NULL, $type = 'AND ', $escape = N
 				$k = substr($k, 0, $match[0][1]).($match[1][0] === '=' ? ' IS NULL' : ' IS NOT NULL');
 			}
 
-			$this->{$qb_key}[] = array('condition' => $prefix.$k.$v, 'escape' => $escape);
+			${$qb_key} = array('condition' => $prefix.$k, 'value' => $v, 'escape' => $escape);
+			$this->{$qb_key}[] = ${$qb_key};
 			if ($this->qb_caching === TRUE)
 			{
-				$this->{$qb_cache_key}[] = array('condition' => $prefix.$k.$v, 'escape' => $escape);
+				$this->{$qb_cache_key}[] = ${$qb_key};
 				$this->qb_cache_exists[] = substr($qb_key, 3);
 			}
 
@@ -834,6 +835,7 @@ protected function _where_in($key = NULL, $values = NULL, $not = FALSE, $type =
 
 		$where_in = array(
 			'condition' => $prefix.$key.$not.' IN('.implode(', ', $where_in).')',
+			'value' => NULL,
 			'escape' => $escape
 		);
 
@@ -962,33 +964,34 @@ protected function _like($field, $match = '', $type = 'AND ', $side = 'both', $n
 				$v = $this->escape_like_str($v);
 			}
 
-			if ($side === 'none')
+			switch ($side)
 			{
-				$like_statement = "{$prefix} {$k} {$not} LIKE '{$v}'";
-			}
-			elseif ($side === 'before')
-			{
-				$like_statement = "{$prefix} {$k} {$not} LIKE '%{$v}'";
-			}
-			elseif ($side === 'after')
-			{
-				$like_statement = "{$prefix} {$k} {$not} LIKE '{$v}%'";
-			}
-			else
-			{
-				$like_statement = "{$prefix} {$k} {$not} LIKE '%{$v}%'";
+				case 'none':
+					$v = "'{$v}'";
+					break;
+				case 'before':
+					$v = "%'{$v}'";
+					break;
+				case 'after':
+					$v = "'{$v}%'";
+					break;
+				case 'both':
+				default:
+					$v = "'%{$v}%'";
+					break;
 			}
 
 			// some platforms require an escape sequence definition for LIKE wildcards
 			if ($escape === TRUE && $this->_like_escape_str !== '')
 			{
-				$like_statement .= sprintf($this->_like_escape_str, $this->_like_escape_chr);
+				$v .= sprintf($this->_like_escape_str, $this->_like_escape_chr);
 			}
 
-			$this->qb_where[] = array('condition' => $like_statement, 'escape' => $escape);
+			$qb_where = array('condition' => "{$prefix} {$k} {$not} LIKE", 'value' => $v, 'escape' => $escape);
+			$this->qb_where[] = $qb_where;
 			if ($this->qb_caching === TRUE)
 			{
-				$this->qb_cache_where[] = array('condition' => $like_statement, 'escape' => $escape);
+				$this->qb_cache_where[] = $qb_where;
 				$this->qb_cache_exists[] = 'where';
 			}
 		}
@@ -1013,6 +1016,7 @@ public function group_start($not = '', $type = 'AND ')
 		$prefix = (count($this->qb_where) === 0 && count($this->qb_cache_where) === 0) ? '' : $type;
 		$where = array(
 			'condition' => $prefix.$not.str_repeat(' ', ++$this->qb_where_group_count).' (',
+			'value' => NULL,
 			'escape' => FALSE
 		);
 
@@ -1073,6 +1077,7 @@ public function group_end()
 		$this->qb_where_group_started = FALSE;
 		$where = array(
 			'condition' => str_repeat(' ', $this->qb_where_group_count--).')',
+			'value' => NULL,
 			'escape' => FALSE
 		);
 
@@ -1433,7 +1438,7 @@ public function count_all_results($table = '', $reset = TRUE)
 	// --------------------------------------------------------------------
 
 	/**
-	 * Get_Where
+	 * get_where()
 	 *
 	 * Allows the where clause, limit and offset to be added directly
 	 *
@@ -2395,7 +2400,7 @@ protected function _compile_wh($qb_key)
 				}
 				elseif ($this->{$qb_key}[$i]['escape'] === FALSE)
 				{
-					$this->{$qb_key}[$i] = $this->{$qb_key}[$i]['condition'];
+					$this->{$qb_key}[$i] = $this->{$qb_key}[$i]['condition'].(isset($this->{$qb_key}[$i]['value']) ? ' '.$this->{$qb_key}[$i]['value'] : '');
 					continue;
 				}
 
@@ -2434,7 +2439,7 @@ protected function _compile_wh($qb_key)
 						.' '.trim($matches[3]).$matches[4].$matches[5];
 				}
 
-				$this->{$qb_key}[$i] = implode('', $conditions);
+				$this->{$qb_key}[$i] = implode('', $conditions).(isset($this->{$qb_key}[$i]['value']) ? ' '.$this->{$qb_key}[$i]['value'] : '');
 			}
 
 			return ($qb_key === 'qb_having' ? "\nHAVING " : "\nWHERE ")
diff --git a/fuel/codeigniter/database/drivers/oci8/oci8_driver.php b/fuel/codeigniter/database/drivers/oci8/oci8_driver.php
index 1bd977390..b90db4bd2 100755
--- a/fuel/codeigniter/database/drivers/oci8/oci8_driver.php
+++ b/fuel/codeigniter/database/drivers/oci8/oci8_driver.php
@@ -97,7 +97,7 @@ class CI_DB_oci8_driver extends CI_DB {
 	 *
 	 * @var	bool
 	 */
-	public $limit_used;
+	public $limit_used = FALSE;
 
 	// --------------------------------------------------------------------
 
@@ -685,4 +685,17 @@ protected function _close()
 		oci_close($this->conn_id);
 	}
 
+	// --------------------------------------------------------------------
+
+	/**
+	 * We need to reset our $limit_used hack flag, so it doesn't propagate
+	 * to subsequent queries.
+	 *
+	 * @return	void
+	 */
+	protected function _reset_select()
+	{
+		$this->limit_used = FALSE;
+		parent::_reset_select();
+	}
 }
diff --git a/fuel/codeigniter/database/drivers/postgre/postgre_driver.php b/fuel/codeigniter/database/drivers/postgre/postgre_driver.php
index 7fb258abb..5779c8783 100755
--- a/fuel/codeigniter/database/drivers/postgre/postgre_driver.php
+++ b/fuel/codeigniter/database/drivers/postgre/postgre_driver.php
@@ -224,8 +224,8 @@ public function version()
 		 * and so we'll have to fall back to running a query in
 		 * order to get it.
 		 */
-		return isset($pg_version['server'])
-			? $this->data_cache['version'] = $pg_version['server']
+		return (isset($pg_version['server']) && preg_match('#^(\d+\.\d+)#', $pg_version['server'], $match))
+			? $this->data_cache['version'] = $match[1]
 			: parent::version();
 	}
 
@@ -354,8 +354,7 @@ public function affected_rows()
 	 */
 	public function insert_id()
 	{
-		$v = pg_version($this->conn_id);
-		$v = isset($v['server']) ? $v['server'] : 0; // 'server' key is only available since PosgreSQL 7.4
+		$v = $this->version();
 
 		$table	= (func_num_args() > 0) ? func_get_arg(0) : NULL;
 		$column	= (func_num_args() > 1) ? func_get_arg(1) : NULL;
diff --git a/fuel/codeigniter/libraries/Email.php b/fuel/codeigniter/libraries/Email.php
index 6a8bda70e..a53e7e72a 100755
--- a/fuel/codeigniter/libraries/Email.php
+++ b/fuel/codeigniter/libraries/Email.php
@@ -1035,7 +1035,7 @@ public function valid_email($email)
 		if (function_exists('idn_to_ascii') && strpos($email, '@'))
 		{
 			list($account, $domain) = explode('@', $email, 2);
-			$domain = is_php('5.4')
+			$domain = defined('INTL_IDNA_VARIANT_UTS46')
 				? idn_to_ascii($domain, 0, INTL_IDNA_VARIANT_UTS46)
 				: idn_to_ascii($domain);
 			$email = $account.'@'.$domain;
@@ -1856,7 +1856,7 @@ protected function _validate_email_for_shell(&$email)
 		if (function_exists('idn_to_ascii') && strpos($email, '@'))
 		{
 			list($account, $domain) = explode('@', $email, 2);
-			$domain = is_php('5.4')
+			$domain = defined('INTL_IDNA_VARIANT_UTS46')
 				? idn_to_ascii($domain, 0, INTL_IDNA_VARIANT_UTS46)
 				: idn_to_ascii($domain);
 			$email = $account.'@'.$domain;
@@ -2074,7 +2074,19 @@ protected function _smtp_connect()
 			$this->_send_command('hello');
 			$this->_send_command('starttls');
 
-			$crypto = stream_socket_enable_crypto($this->_smtp_connect, TRUE, STREAM_CRYPTO_METHOD_TLS_CLIENT);
+			/**
+			 * STREAM_CRYPTO_METHOD_TLS_CLIENT is quite the mess ...
+			 *
+			 * - On PHP <5.6 it doesn't even mean TLS, but SSL 2.0, and there's no option to use actual TLS
+			 * - On PHP 5.6.0-5.6.6, >=7.2 it means negotiation with any of TLS 1.0, 1.1, 1.2
+			 * - On PHP 5.6.7-7.1.* it means only TLS 1.0
+			 *
+			 * We want the negotiation, so we'll force it below ...
+			 */
+			$method = is_php('5.6')
+				? STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT | STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT | STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT
+				: STREAM_CRYPTO_METHOD_TLS_CLIENT;
+			$crypto = stream_socket_enable_crypto($this->_smtp_connect, TRUE, $method);
 
 			if ($crypto !== TRUE)
 			{
diff --git a/fuel/codeigniter/libraries/Form_validation.php b/fuel/codeigniter/libraries/Form_validation.php
index 3444c65a0..6a97ee599 100755
--- a/fuel/codeigniter/libraries/Form_validation.php
+++ b/fuel/codeigniter/libraries/Form_validation.php
@@ -1231,7 +1231,7 @@ public function valid_email($str)
 	{
 		if (function_exists('idn_to_ascii') && preg_match('#\A([^@]+)@(.+)\z#', $str, $matches))
 		{
-			$domain = is_php('5.4')
+			$domain = defined('INTL_IDNA_VARIANT_UTS46')
 				? idn_to_ascii($matches[2], 0, INTL_IDNA_VARIANT_UTS46)
 				: idn_to_ascii($matches[2]);
 			$str = $matches[1].'@'.$domain;
diff --git a/fuel/codeigniter/libraries/Image_lib.php b/fuel/codeigniter/libraries/Image_lib.php
index b9adcd6e5..a5cb6fb47 100755
--- a/fuel/codeigniter/libraries/Image_lib.php
+++ b/fuel/codeigniter/libraries/Image_lib.php
@@ -835,7 +835,10 @@ public function image_process_gd($action = 'resize')
 		imagedestroy($dst_img);
 		imagedestroy($src_img);
 
-		chmod($this->full_dst_path, $this->file_permissions);
+		if ($this->dynamic_output !== TRUE)
+		{
+			chmod($this->full_dst_path, $this->file_permissions);
+		}
 
 		return TRUE;
 	}
diff --git a/fuel/codeigniter/libraries/Xmlrpc.php b/fuel/codeigniter/libraries/Xmlrpc.php
index 39e4dd37e..c23504de8 100755
--- a/fuel/codeigniter/libraries/Xmlrpc.php
+++ b/fuel/codeigniter/libraries/Xmlrpc.php
@@ -1181,7 +1181,7 @@ public function parseResponse($fp)
 		$data = implode("\r\n", $lines);
 
 		// Parse XML data
-		if ( ! xml_parse($parser, $data, count($data)))
+		if ( ! xml_parse($parser, $data, TRUE))
 		{
 			$errstr = sprintf('XML error: %s at line %d',
 						xml_error_string(xml_get_error_code($parser)),

From 6a9e7022010caef4d1f91639ff45caf4cb0cc520 Mon Sep 17 00:00:00 2001
From: David McReynolds <dave@thedaylightstudio.com>
Date: Wed, 18 Apr 2018 22:19:24 -0700
Subject: [PATCH 053/129] Fix for error on upload for pages

---
 fuel/modules/fuel/controllers/Pages.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fuel/modules/fuel/controllers/Pages.php b/fuel/modules/fuel/controllers/Pages.php
index f7dc5f3bb..32cfc750d 100644
--- a/fuel/modules/fuel/controllers/Pages.php
+++ b/fuel/modules/fuel/controllers/Pages.php
@@ -1236,9 +1236,9 @@ protected function _process_upload_data($field_names, $uploaded_data, $posted)
 				$data = $this->fuel_pagevariables_model->find_one_array($where);
 
 				// if there is a field with the suffix of _upload, then we will overwrite that posted value with this value
-				if (substr($file_tmp, ($file_tmp - 7)) == '_upload')
+				if (substr($file_tmp, strlen($file_tmp) - 7) == '_upload')
 				{
-					$field_name = substr($file_tmp, 0, ($file_tmp - 7));
+					$field_name = substr($file_tmp, 0, strlen($file_tmp) - 7);
 				}
 
 				if (isset($posted[$field_name]))

From 8975eb520de79a542e4a35f42a0e730b080fd672 Mon Sep 17 00:00:00 2001
From: David McReynolds <dave@thedaylightstudio.com>
Date: Thu, 19 Apr 2018 21:51:24 -0700
Subject: [PATCH 054/129] Added additional parameters to find_by_context
 methods

---
 fuel/modules/fuel/libraries/Fuel_categories.php |  6 ++++--
 fuel/modules/fuel/libraries/Fuel_tags.php       | 12 +++++++++---
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/fuel/modules/fuel/libraries/Fuel_categories.php b/fuel/modules/fuel/libraries/Fuel_categories.php
index bf4e7d8b2..ce1778057 100644
--- a/fuel/modules/fuel/libraries/Fuel_categories.php
+++ b/fuel/modules/fuel/libraries/Fuel_categories.php
@@ -58,13 +58,15 @@ public function find_by_slug($slug)
 	 *
 	 * @access	public
 	 * @param	string	the context to query on
+	 * @param	string	$order
+	 * @param	int	limit
 	 * @return	array
 	 */	
-	public function find_by_context($context)
+	public function find_by_context($context, $order = NULL, $limit = NULL)
 	{
 		$model = $this->model();
 		$where = 'FIND_IN_SET("'.$context.'", '.$model->table_name().'.context)';
-		$data = $model->find_all($where);
+		$data = $model->find_all($where, $order, $limit);
 		return $data;
 	}
 
diff --git a/fuel/modules/fuel/libraries/Fuel_tags.php b/fuel/modules/fuel/libraries/Fuel_tags.php
index 9befeb4c8..f95d637ca 100644
--- a/fuel/modules/fuel/libraries/Fuel_tags.php
+++ b/fuel/modules/fuel/libraries/Fuel_tags.php
@@ -66,20 +66,23 @@ public function find_by_tag($tag, $category = NULL)
 	 * @access	public
 	 * @param	string	the context value in which to search for a tag
 	 * @param	boolean	determines whether to return just one or not (optional)
+	 * @param	string	$order (optional)
+	 * @param	int	$limit (optional)
+	 * @param	int	$offset (optional)
 	 * @return	object
 	 */	
-	public function find_by_context($context, $one = FALSE)
+	public function find_by_context($context, $one = FALSE, $order = NULL, $limit = NULL, $offset = NULL)
 	{
 		$model = $this->model();
 		$model = $this->model();
 		$where = 'FIND_IN_SET("'.$context.'", '.$model->table_name().'.context)';
 		if ($one)
 		{
-			$data = $model->find_one($where);	
+			$data = $model->find_one($where);
 		}
 		else
 		{
-			$data = $model->find_all($where);	
+			$data = $model->find_all($where, $order, $limit, $offset);
 		}
 		return $data;
 	}
@@ -91,6 +94,9 @@ public function find_by_context($context, $one = FALSE)
 	 *
 	 * @access	public
 	 * @param	string	the name of the category
+	 * @param	string	$order (optional)
+	 * @param	int	$limit (optional)
+	 * @param	int	$offset (optional)
 	 * @return	array
 	 */	
 	public function find_by_category($category, $order = NULL, $limit = NULL, $offset = NULL)

From 6e5e75d466507a5fed4194e14246e8253eb57e74 Mon Sep 17 00:00:00 2001
From: David McReynolds <dave@thedaylightstudio.com>
Date: Wed, 25 Apr 2018 21:48:51 -0700
Subject: [PATCH 055/129] Fuel_custm_fields.php error fix

---
 fuel/modules/fuel/libraries/Fuel_custom_fields.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fuel/modules/fuel/libraries/Fuel_custom_fields.php b/fuel/modules/fuel/libraries/Fuel_custom_fields.php
index acbe9c47a..7f0791bd6 100644
--- a/fuel/modules/fuel/libraries/Fuel_custom_fields.php
+++ b/fuel/modules/fuel/libraries/Fuel_custom_fields.php
@@ -1504,7 +1504,7 @@ public function list_items($params)
 			{
 				$lis = explode("\n", $value);
 				$lis = array_map("trim", $lis);
-				return '.$list_type.'($lis, "'.$output_class.'");
+				return $list_type($lis, $output_class);
 			}
 
 		};

From ba8ab05b62448f86373905506e389ef236190db4 Mon Sep 17 00:00:00 2001
From: David McReynolds <dave@thedaylightstudio.com>
Date: Wed, 25 Apr 2018 22:14:13 -0700
Subject: [PATCH 056/129] Fix for $l_delim error in Fuel_dwoo_parser.php

---
 fuel/modules/fuel/libraries/parser/Fuel_dwoo_parser.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/fuel/modules/fuel/libraries/parser/Fuel_dwoo_parser.php b/fuel/modules/fuel/libraries/parser/Fuel_dwoo_parser.php
index 1fc923f0a..2db8cfe8b 100644
--- a/fuel/modules/fuel/libraries/parser/Fuel_dwoo_parser.php
+++ b/fuel/modules/fuel/libraries/parser/Fuel_dwoo_parser.php
@@ -103,14 +103,13 @@ public function _parse($string, $data, $return = FALSE)
 				$r_delim = $delimiters[1];
 
 				$compiler->setDelimiters($l_delim, $r_delim);
-
 				
 				//Add a pre-processor to help fix javascript {}
 				// added by David McReynolds @ Daylight Studio 11/04/10
 				$callback = function($compiler) use ($l_delim) {
 					$string = $compiler->getTemplateSource();
 					
-					$callback = function($matches){
+					$callback = function($matches) use ($l_delim){
 						if (isset($matches[1]))
 						{
 							$str = "<script";

From 66b2c73bac4364bb97e775d6526ed2dcbdfd9dc8 Mon Sep 17 00:00:00 2001
From: David McReynolds <dave@thedaylightstudio.com>
Date: Tue, 1 May 2018 15:51:31 -0700
Subject: [PATCH 057/129] Added replacement for {id} placeholders after create

---
 fuel/modules/fuel/controllers/Module.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/fuel/modules/fuel/controllers/Module.php b/fuel/modules/fuel/controllers/Module.php
index d8b9df3be..2a2f54198 100644
--- a/fuel/modules/fuel/controllers/Module.php
+++ b/fuel/modules/fuel/controllers/Module.php
@@ -967,6 +967,15 @@ protected function _process_create()
 			if ( ! is_array($this->model->key_field()))
 			{
 				$posted[$this->model->key_field()] = $id;
+
+				// replace any {id} placeholder values
+				foreach ($posted as $key => $val)
+				{
+					if (is_string($val))
+					{
+						$posted[$key] = str_replace('{'.$this->model->key_field().'}', $id, $val);
+					}
+				}
 			}
 
 			// process $_FILES

From 2285ec7c5cb19494b39107e2f136cc66534f2364 Mon Sep 17 00:00:00 2001
From: David McReynolds <dave@thedaylightstudio.com>
Date: Thu, 3 May 2018 08:19:05 -0700
Subject: [PATCH 058/129] Fix for PHP 7.2 error using each() function in
 Dwoo/Compiler.php

---
 fuel/modules/fuel/libraries/parser/dwoo/Dwoo/Compiler.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/fuel/modules/fuel/libraries/parser/dwoo/Dwoo/Compiler.php b/fuel/modules/fuel/libraries/parser/dwoo/Dwoo/Compiler.php
index ccd8ccda7..137e359fe 100755
--- a/fuel/modules/fuel/libraries/parser/dwoo/Dwoo/Compiler.php
+++ b/fuel/modules/fuel/libraries/parser/dwoo/Dwoo/Compiler.php
@@ -3041,7 +3041,10 @@ protected function mapParams(array $params, $callback, $callType=2, $map = null)
 		}
 
 		// loops over the param map and assigns values from the template or default value for unset optional params
-		while (list($k,$v) = each($map)) {
+		// while (list($k,$v) = each($map)) {
+
+		// Modified by David McReynolds 2018
+		foreach ($map as $k => $v) {
 			if ($v[0] === '*') {
 				// "rest" array parameter, fill every remaining params in it and then break
 				if (count($ps) === 0) {

From a172a057e3e84d49645d764fb4e1b01e2bd1b119 Mon Sep 17 00:00:00 2001
From: David McReynolds <dave@thedaylightstudio.com>
Date: Tue, 15 May 2018 12:29:23 -0700
Subject: [PATCH 059/129] Fix per forum:
 https://forum.getfuelcms.com/discussion/2898/php-7-2#latest

---
 fuel/modules/fuel/controllers/Module.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fuel/modules/fuel/controllers/Module.php b/fuel/modules/fuel/controllers/Module.php
index 39dd90f2c..9ca6c5201 100644
--- a/fuel/modules/fuel/controllers/Module.php
+++ b/fuel/modules/fuel/controllers/Module.php
@@ -324,7 +324,7 @@ function items()
 				{
 					if (!empty($cols[$CI->model->key_field()]))
 					{
-						$url = fuel_url("'.$this->module_uri.'/delete/".$cols[$CI->model->key_field()]);
+						$url = fuel_url($this->module_uri."/delete/".$cols[$CI->model->key_field()]);
 						$link = "<a href=\"".$url."\" class=\"action_delete\">".lang("table_action_delete")."</a>";
 						$link .= " <input type=\"checkbox\" name=\"delete[".$cols[$CI->model->key_field()]."]\" value=\"1\" id=\"delete_".$cols[$CI->model->key_field()]."\" class=\"multi_delete\"/>";
 					}

From 6d4fcf9a61e2cd5e10c55a4f3dc1bac72304cdcd Mon Sep 17 00:00:00 2001
From: David McReynolds <dave@thedaylightstudio.com>
Date: Sun, 20 May 2018 14:18:51 -0700
Subject: [PATCH 060/129] PHP 7.2 Dwoo Compiler update per
 https://forum.getfuelcms.com/discussion/2898/php-7-2#latest

---
 fuel/modules/fuel/libraries/parser/dwoo/Dwoo/Compiler.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fuel/modules/fuel/libraries/parser/dwoo/Dwoo/Compiler.php b/fuel/modules/fuel/libraries/parser/dwoo/Dwoo/Compiler.php
index 137e359fe..72e974ccd 100755
--- a/fuel/modules/fuel/libraries/parser/dwoo/Dwoo/Compiler.php
+++ b/fuel/modules/fuel/libraries/parser/dwoo/Dwoo/Compiler.php
@@ -2527,7 +2527,7 @@ protected function parseOthers($in, $from, $to, $parsingParams = false, $curBloc
 		}
 
 		$breaker = false;
-		while (list($k,$char) = each($breakChars)) {
+		foreach($breakChars as $k => $char) {
 			$test = strpos($substr, $char);
 			if ($test !== false && $test < $end) {
 				$end = $test;

From c641c1b57188951a41c58218e5fd14d92ffaeaf4 Mon Sep 17 00:00:00 2001
From: David McReynolds <dave@thedaylightstudio.com>
Date: Tue, 29 May 2018 15:04:25 -0700
Subject: [PATCH 061/129] Added CC parameter to Fuel_notification

---
 fuel/modules/fuel/libraries/Fuel_notification.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/fuel/modules/fuel/libraries/Fuel_notification.php b/fuel/modules/fuel/libraries/Fuel_notification.php
index 8deb4d097..86361afac 100644
--- a/fuel/modules/fuel/libraries/Fuel_notification.php
+++ b/fuel/modules/fuel/libraries/Fuel_notification.php
@@ -30,6 +30,7 @@
 class Fuel_notification extends Fuel_base_library {
 
 	public $to = ''; // the to address to send the notification
+	public $cc = ''; // the CC address to send the notification
 	public $from = ''; // the from address of the sender
 	public $from_name = ''; // the from name of the sender
 	public $subject = ''; // the subject line of the notification
@@ -112,6 +113,11 @@ public function send($params = array())
 		{
 			$this->CI->email->to($this->to);
 		}
+
+		if ($this->cc)
+		{
+			$this->CI->email->cc($this->cc);
+		}
 		
 		if (!$this->CI->email->send())
 		{

From f92af9a15b0cebb9edf411dc9078e6f0db8db976 Mon Sep 17 00:00:00 2001
From: David McReynolds <dave@thedaylightstudio.com>
Date: Thu, 31 May 2018 11:56:07 -0700
Subject: [PATCH 062/129] Update for optimizing assets when gzip may not be
 available

---
 fuel/modules/fuel/libraries/Asset.php | 57 +++++++++++++++------------
 1 file changed, 31 insertions(+), 26 deletions(-)

diff --git a/fuel/modules/fuel/libraries/Asset.php b/fuel/modules/fuel/libraries/Asset.php
index 5e0408370..929b431f4 100644
--- a/fuel/modules/fuel/libraries/Asset.php
+++ b/fuel/modules/fuel/libraries/Asset.php
@@ -1461,35 +1461,40 @@ public function optimize($files, $params = array())
 		}
 		
 		// gzip if enabled in config and the server
-		if (($params['gzip'] == TRUE) AND extension_loaded('zlib'))
+		if ((($params['gzip'] == TRUE) AND extension_loaded('zlib')) AND (isset($_SERVER['HTTP_ACCEPT_ENCODING']) AND strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') !== FALSE))
 		{
-			if (isset($_SERVER['HTTP_ACCEPT_ENCODING']) AND strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') !== FALSE)
+			$gzip = "<?php".PHP_EOL;
+			$gzip .= "ob_start();".PHP_EOL;
+		
+			// start an inner buffer so we can get the content length
+			$gzip .= "ob_start (\"ob_gzhandler\");".PHP_EOL;
+			$gzip .= "\n?>";
+			$gzip .= $output;
+			$gzip .= "<?php".PHP_EOL;
+			$gzip .= "ob_end_flush();".PHP_EOL;
+		
+			// now begin inner buffer headers
+			if (!empty($mime))
 			{
-				$gzip = "<?php".PHP_EOL;
-				$gzip .= "ob_start();".PHP_EOL;
-			
-				// start an inner buffer so we can get the content length
-				$gzip .= "ob_start (\"ob_gzhandler\");".PHP_EOL;
-				$gzip .= "\n?>";
-				$gzip .= $output;
-				$gzip .= "<?php".PHP_EOL;
-				$gzip .= "ob_end_flush();".PHP_EOL;
-			
-				// now begin inner buffer headers
-				if (!empty($mime))
-				{
-					$gzip .= "header(\"Content-type: ".$mime."; charset: UTF-8\");".PHP_EOL;	
-				}
-				$gzip .= "header(\"Cache-Control: must-revalidate\");".PHP_EOL;
-				$gzip .= "\$offset = ".$this->assets_gzip_cache_expiration.";".PHP_EOL;
-				$gzip .= "\$exp = \"Expires: \".gmdate(\"D, d M Y H:i:s\",time() + \$offset).\" GMT\";".PHP_EOL;
-				$gzip .= "header(\$exp);".PHP_EOL;
-				$gzip .= "\$size = \"Content-Length: \".ob_get_length();".PHP_EOL;
-				$gzip .= "header(\$size);".PHP_EOL;
-				$gzip .= 'ob_end_flush();';
-				$gzip .= "\n?>".PHP_EOL;
-				$output = $gzip;
+				$gzip .= "header(\"Content-type: ".$mime."; charset: UTF-8\");".PHP_EOL;	
 			}
+			$gzip .= "header(\"Cache-Control: must-revalidate\");".PHP_EOL;
+			$gzip .= "\$offset = ".$this->assets_gzip_cache_expiration.";".PHP_EOL;
+			$gzip .= "\$exp = \"Expires: \".gmdate(\"D, d M Y H:i:s\",time() + \$offset).\" GMT\";".PHP_EOL;
+			$gzip .= "header(\$exp);".PHP_EOL;
+			$gzip .= "\$size = \"Content-Length: \".ob_get_length();".PHP_EOL;
+			$gzip .= "header(\$size);".PHP_EOL;
+			$gzip .= 'ob_end_flush();';
+			$gzip .= "\n?>".PHP_EOL;
+			$output = $gzip;
+		}
+		else
+		{
+			$out = "<?php".PHP_EOL;
+			$out .= "header(\"Content-type: ".$mime."; charset: UTF-8\");";
+			$out .= "\n?>".PHP_EOL;
+			$out .= $output;
+			$output = $out;
 		}
 
 		// write contents to file

From 82afe09c176eadcca176f38482317b18ae80858f Mon Sep 17 00:00:00 2001
From: David McReynolds <dave@thedaylightstudio.com>
Date: Fri, 8 Jun 2018 11:07:07 -0700
Subject: [PATCH 063/129] Added reply_to for Fuel_notification

---
 fuel/modules/fuel/libraries/Fuel_notification.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/fuel/modules/fuel/libraries/Fuel_notification.php b/fuel/modules/fuel/libraries/Fuel_notification.php
index 86361afac..b7548cdc7 100644
--- a/fuel/modules/fuel/libraries/Fuel_notification.php
+++ b/fuel/modules/fuel/libraries/Fuel_notification.php
@@ -31,6 +31,7 @@ class Fuel_notification extends Fuel_base_library {
 
 	public $to = ''; // the to address to send the notification
 	public $cc = ''; // the CC address to send the notification
+	public $reply_to = ''; // the reply to address to send the notification
 	public $from = ''; // the from address of the sender
 	public $from_name = ''; // the from name of the sender
 	public $subject = ''; // the subject line of the notification
@@ -119,6 +120,11 @@ public function send($params = array())
 			$this->CI->email->cc($this->cc);
 		}
 		
+		if ($this->reply_to)
+		{
+			$this->CI->email->reply_to($this->reply_to);
+		}
+
 		if (!$this->CI->email->send())
 		{
 			$this->_errors[] = $this->CI->email->print_debugger();

From 207d75f5e36f9b0df68597dba712cd67d44d723b Mon Sep 17 00:00:00 2001
From: David McReynolds <dave@thedaylightstudio.com>
Date: Mon, 11 Jun 2018 09:19:27 -0700
Subject: [PATCH 064/129] Update for google_helper https

---
 fuel/modules/fuel/helpers/google_helper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fuel/modules/fuel/helpers/google_helper.php b/fuel/modules/fuel/helpers/google_helper.php
index c5bb0d46e..b6cf38f3d 100644
--- a/fuel/modules/fuel/helpers/google_helper.php
+++ b/fuel/modules/fuel/helpers/google_helper.php
@@ -326,7 +326,7 @@ function google_map_url($address, $params = array())
 
 		// set output
 		$p['output'] = 'embed';
-		$url = 'http://maps.google.com/maps?'.http_build_query($p, '', '&amp;');
+		$url = (is_https() ? 'https': 'http').'://maps.google.com/maps?'.http_build_query($p, '', '&amp;');
 		return $url;
 	}
 }

From e0f721232b9fca628d85ead6729a8a32453048a4 Mon Sep 17 00:00:00 2001
From: David McReynolds <dave@thedaylightstudio.com>
Date: Tue, 12 Jun 2018 11:01:15 -0700
Subject: [PATCH 065/129] Added create_url for the embedded_list table

---
 fuel/modules/fuel/libraries/Fuel_custom_fields.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/fuel/modules/fuel/libraries/Fuel_custom_fields.php b/fuel/modules/fuel/libraries/Fuel_custom_fields.php
index 026a96782..761022b2d 100644
--- a/fuel/modules/fuel/libraries/Fuel_custom_fields.php
+++ b/fuel/modules/fuel/libraries/Fuel_custom_fields.php
@@ -2169,7 +2169,8 @@ public function embedded_list($params)
 		$edit_url_params = (!empty($params['edit_url_params'])) ? http_build_query($params['edit_url_params']) : '';
 		$display_fields = (!empty($params['display_fields'])) ? $params['display_fields'] : NULL;
 
-		$create_url = "{$module_url}/inline_create";
+		$create_url = (!empty($params['create_url'])) ? $params['create_url'] : "{$module_url}/inline_create";
+		
 		if (!empty($display_fields))
 		{
 			if (is_array($display_fields))

From e0dbbc757142f86d3707ae579652ccb40653a03a Mon Sep 17 00:00:00 2001
From: David McReynolds <dave@thedaylightstudio.com>
Date: Fri, 6 Jul 2018 08:11:42 -0700
Subject: [PATCH 066/129] Moved composer.json from fuel/composer.json to root
 directory per issue #476

---
 fuel/composer.json => composer.json | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename fuel/composer.json => composer.json (100%)

diff --git a/fuel/composer.json b/composer.json
similarity index 100%
rename from fuel/composer.json
rename to composer.json

From 7010650376496642bcc8846371558ff68ad0ca17 Mon Sep 17 00:00:00 2001
From: David McReynolds <dave@thedaylightstudio.com>
Date: Fri, 6 Jul 2018 08:13:33 -0700
Subject: [PATCH 067/129] =?UTF-8?q?Changed=20the=20order=20in=20which=20Fo?=
 =?UTF-8?q?rm=5Fbuilder=20assembles=20information=20in=20Module=20to=20all?=
 =?UTF-8?q?ow=20for=20overwrites=20in=20a=20model=E2=80=99s=20form=5Ffield?=
 =?UTF-8?q?s=20method?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fuel/modules/fuel/controllers/Module.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/fuel/modules/fuel/controllers/Module.php b/fuel/modules/fuel/controllers/Module.php
index 2a2f54198..c74b62f3b 100644
--- a/fuel/modules/fuel/controllers/Module.php
+++ b/fuel/modules/fuel/controllers/Module.php
@@ -1449,10 +1449,6 @@ protected function _form_vars($id = NULL, $values = array(), $field = NULL, $inl
 				$this->form_builder->hidden = (array) $this->model->key_field();
 			}
 
-			$this->form_builder->set_fields($fields);
-			$this->form_builder->display_errors = FALSE;
-			$this->form_builder->set_field_values($field_values);
-
 			if ($this->config->item('date_format'))
 			{
 				$this->form_builder->date_format = $this->config->item('date_format');
@@ -1467,6 +1463,10 @@ protected function _form_vars($id = NULL, $values = array(), $field = NULL, $inl
 				$this->form_builder->cancel_value = lang('btn_cancel');
 			}
 
+			$this->form_builder->set_fields($fields);
+			$this->form_builder->display_errors = FALSE;
+			$this->form_builder->set_field_values($field_values);
+
 			// we will set this in the BaseFuelController.js file so that the jqx page variable is available upon execution of any form field js
 			//$this->form_builder->auto_execute_js = FALSE;
 			if (!isset($fields['__FORM_BUILDER__'], $fields['__FORM_BUILDER__']['displayonly']))

From 037c357c7f496c06c0c060bd05038c5cda48cd91 Mon Sep 17 00:00:00 2001
From: David McReynolds <dave@thedaylightstudio.com>
Date: Fri, 6 Jul 2018 08:14:25 -0700
Subject: [PATCH 068/129] Allowed a custom display for displayonly parameter on
 a form field

---
 fuel/modules/fuel/libraries/Form_builder.php | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/fuel/modules/fuel/libraries/Form_builder.php b/fuel/modules/fuel/libraries/Form_builder.php
index f73e0eb2d..4a8b60bc1 100644
--- a/fuel/modules/fuel/libraries/Form_builder.php
+++ b/fuel/modules/fuel/libraries/Form_builder.php
@@ -624,7 +624,15 @@ public function render_divs($fields = NULL)
 			}
 			else if ((is_array($val['name']) AND in_array($val['name'], $this->displayonly)) OR  $val['displayonly'] OR  (is_string($this->displayonly) AND strtolower($this->displayonly) == 'all'))
 			{
-				$display_value = (is_array($val['value'])) ? print_r($val['value'], TRUE) : $val['value'];
+				if (isset($val['displayonly']) AND !is_bool($val['displayonly']))
+				{
+					$display_value = $val['displayonly'];
+				}
+				else
+				{
+					$display_value = (is_array($val['value'])) ? print_r($val['value'], TRUE) : $val['value'];	
+				}
+
 				$str .= "<div".$this->_open_row_attrs($val).'>';
 				$str .= "<span class=\"label\">";
 				$str .= $val['before_label'].$this->create_label($val, FALSE).$val['after_label'];
@@ -823,7 +831,15 @@ public function render_table($fields = NULL)
 			{
 				$str .= "<tr".$this->_open_row_attrs($val);
 				$str .= ">\n\t<td class=\"label\">";
-				$display_value = (is_array($val['value'])) ? print_r($val['value'], TRUE) : $val['value'];
+				if (isset($val['displayonly']) AND !is_bool($val['displayonly']))
+				{
+					$display_value = $val['displayonly'];
+				}
+				else
+				{
+					$display_value = (is_array($val['value'])) ? print_r($val['value'], TRUE) : $val['value'];	
+				}
+				
 				if ($this->label_layout != 'top')
 				{
 					$str .= $val['before_label'].$this->create_label($val, FALSE).$val['after_label'];

From 6c72834a0d8d3bc34604b9ae0dbb6eef32c0070e Mon Sep 17 00:00:00 2001
From: David McReynolds <dave@thedaylightstudio.com>
Date: Mon, 9 Jul 2018 12:45:30 -0700
Subject: [PATCH 069/129] Security vulnerability updates for issue #478

---
 fuel/modules/fuel/controllers/Pages.php        | 6 ++++--
 fuel/modules/fuel/controllers/Preview.php      | 2 +-
 fuel/modules/fuel/models/Base_module_model.php | 6 +++---
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/fuel/modules/fuel/controllers/Pages.php b/fuel/modules/fuel/controllers/Pages.php
index 32cfc750d..bb24143cb 100644
--- a/fuel/modules/fuel/controllers/Pages.php
+++ b/fuel/modules/fuel/controllers/Pages.php
@@ -900,6 +900,7 @@ public function select()
 		$filter = str_replace(':any', '.+', str_replace(':num', '[0-9]+', $filter));
 		$this->js_controller_params['method'] = 'select';
 
+
 		$this->load->helper('array');
 		$this->load->helper('form');
 		$this->load->library('form_builder');
@@ -921,7 +922,8 @@ public function select()
 		// apply filter
 		if ( ! empty($filter))
 		{
-			$filter_callback = create_function('$a', 'return preg_match(\'#^'.$filter.'$#\', $a);');
+
+			$filter_callback = create_function('$a', 'return preg_match(\'#^'.addslashes($filter).'$#\', $a);');
 			if (!empty($has_pdfs))
 			{
 				$options[lang('page_select_pages')] = array_filter($options[lang('page_select_pages')], $filter_callback);
@@ -929,7 +931,7 @@ public function select()
 			}
 			else
 			{
-				$options = array_filter($options, $filter_callback);	
+				$options = array_filter($options, $filter_callback);
 			}
 		}
 
diff --git a/fuel/modules/fuel/controllers/Preview.php b/fuel/modules/fuel/controllers/Preview.php
index c3a67a6c7..0f6798c40 100644
--- a/fuel/modules/fuel/controllers/Preview.php
+++ b/fuel/modules/fuel/controllers/Preview.php
@@ -19,7 +19,7 @@ public function index()
 		define('FUELIFY', FALSE);
 
 		// check for posted data
-		$data = $this->input->get_post('data', FALSE);
+		$data = $this->input->get_post('data', TRUE);
 
 		//if (empty($data)) show_error(lang('error_cannot_preview'));
 
diff --git a/fuel/modules/fuel/models/Base_module_model.php b/fuel/modules/fuel/models/Base_module_model.php
index 7445ca8b3..c67506c08 100644
--- a/fuel/modules/fuel/models/Base_module_model.php
+++ b/fuel/modules/fuel/models/Base_module_model.php
@@ -350,7 +350,7 @@ public function list_items($limit = NULL, $offset = 0, $col = 'id', $order = 'as
 		{
 			return count($data);
 		}
-		//$this->debug_query();
+		
 		return $data;
 	}
 
@@ -438,7 +438,7 @@ protected function _list_items_query()
 					{
 						if (strlen($v))
 						{
-							array_push($arrjoiner, $key.'='.$v);
+							array_push($arrjoiner, $key.'='.$this->db->escape($v));
 						}
 					}
 					if (!empty($arrjoiner))
@@ -451,7 +451,7 @@ protected function _list_items_query()
 				{
 					//$method = ($joiner == 'or') ? 'or_like' : 'like';
 					//$this->db->$method('LOWER('.$key.')', strtolower($val), 'both');
-					array_push($$joiner_arr, 'LOWER('.$key.') LIKE "%'.strtolower($val).'%"');
+					array_push($$joiner_arr, 'LOWER('.$key.') LIKE "%'.strtolower($this->db->escape($val)).'%"');
 				}
 			}
 		}

From 80459a5696bb7f6f0f4ba38bdbe4bf98c59c34d4 Mon Sep 17 00:00:00 2001
From: David McReynolds <dave@thedaylightstudio.com>
Date: Tue, 10 Jul 2018 12:39:10 -0700
Subject: [PATCH 070/129] Fix for issue where uploading assets with
 transformations retain last uploaded parameters

---
 fuel/modules/fuel/libraries/Fuel_assets.php | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/fuel/modules/fuel/libraries/Fuel_assets.php b/fuel/modules/fuel/libraries/Fuel_assets.php
index 9002f7fb1..b91b2da21 100644
--- a/fuel/modules/fuel/libraries/Fuel_assets.php
+++ b/fuel/modules/fuel/libraries/Fuel_assets.php
@@ -342,8 +342,9 @@ public function upload($params = array())
 						}
 					}
 				}
-				
 			}
+
+			$_params[$key] = $params;
 		}
 
 		// set maintain ratio if it is set to maintain_ratio
@@ -353,18 +354,19 @@ public function upload($params = array())
 		}
 
 		// now loop through the uploaded files to do any further image processing
-		foreach($this->_data as $file)
+		foreach($this->_data as $key => $file)
 		{
 			if (is_image_file($file['file_name']) AND 
-					(isset($params['create_thumb']) OR 
-					isset($params['maintain_ratio']) OR 
-					!empty($params['width']) OR 
-					!empty($params['height']) OR
-					!empty($params['master_dim']) OR
-					!empty($params['resize_and_crop']) OR
-					!empty($params['resize_method'])
+					(isset($_params[$key]['create_thumb']) OR 
+					isset($_params[$key]['maintain_ratio']) OR 
+					!empty($_params[$key]['width']) OR 
+					!empty($_params[$key]['height']) OR
+					!empty($_params[$key]['master_dim']) OR
+					!empty($_params[$key]['resize_and_crop']) OR
+					!empty($_params[$key]['resize_method'])
 					))
 			{
+				$params = $_params[$key];
 
 				$params['source_image']	= $file['full_path'];
 

From 0a18bb3950784d4b5e7d86f054a03431d7b98668 Mon Sep 17 00:00:00 2001
From: David McReynolds <dave@thedaylightstudio.com>
Date: Wed, 11 Jul 2018 16:51:27 -0700
Subject: [PATCH 071/129] Fix for embedded list rows without any valid actions

---
 fuel/modules/fuel/models/Base_module_model.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/fuel/modules/fuel/models/Base_module_model.php b/fuel/modules/fuel/models/Base_module_model.php
index c67506c08..ade7e4a4f 100644
--- a/fuel/modules/fuel/models/Base_module_model.php
+++ b/fuel/modules/fuel/models/Base_module_model.php
@@ -1238,12 +1238,15 @@ public function get_embedded_list_items($params, $list_cols = array(), $actions
 				$actions = array('edit');
 			}
 
+			$valid_actions = array();
+		
 			foreach($actions as $action => $label)
 			{
 				if (is_int($action))
 				{
 					$action = $label;
 				}
+
 				if (is_string($action) AND $this->fuel->auth->has_permission($module->info('permission'), $action) OR $action == 'custom')
 				{
 					switch(strtolower($action))
@@ -1267,17 +1270,20 @@ public function get_embedded_list_items($params, $list_cols = array(), $actions
 								$action_url .= '?'. $params['edit_url_params'];
 							}
 							$data_table->add_action(lang('table_action_edit'), $action_url, 'url');
+							$valid_actions[] = $action;
 							break;
 						case 'view':
 							if ($module->info('preview_path'))
 							{
 								$action_url = fuel_url($module->info('module_uri').'/view/{'.$this->key_field().'}');
 								$data_table->add_action(lang('table_action_view'), $action_url, 'url');
+								$valid_actions[] = $action;
 							}
 							break;
 						case 'delete':
 							$action_url = fuel_url($module->info('module_uri').'/inline_delete/{'.$this->key_field().'}');
 							$data_table->add_action(lang('table_action_delete'), $action_url, 'url');
+							$valid_actions[] = $action;
 							break;
 						case 'custom':
 							if (is_array($label))
@@ -1288,6 +1294,7 @@ public function get_embedded_list_items($params, $list_cols = array(), $actions
 									{
 										$action_url = fuel_url($key);
 										$data_table->add_action($val, $action_url, 'url');
+										$valid_actions[] = $action;
 									}
 								}
 							}
@@ -1296,8 +1303,9 @@ public function get_embedded_list_items($params, $list_cols = array(), $actions
 				}
 			}
 		}
+		
+		$data_table->row_action = (!empty($valid_actions)) ? TRUE : FALSE;
 
-		$data_table->row_action = TRUE;
 		$data_table->assign_data($list_items, $list_cols);
 		return $data_table->render();
 	}

From 451c91dac2eedf9f477b805984265f72f1bf74e8 Mon Sep 17 00:00:00 2001
From: David McReynolds <dave@thedaylightstudio.com>
Date: Wed, 11 Jul 2018 17:01:48 -0700
Subject: [PATCH 072/129] Added generic editModule method to BaseFuelController

---
 .../fuel/assets/js/fuel/controller/BaseFuelController.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/fuel/modules/fuel/assets/js/fuel/controller/BaseFuelController.js b/fuel/modules/fuel/assets/js/fuel/controller/BaseFuelController.js
index 5a2bb68f6..2a842aaa4 100755
--- a/fuel/modules/fuel/assets/js/fuel/controller/BaseFuelController.js
+++ b/fuel/modules/fuel/assets/js/fuel/controller/BaseFuelController.js
@@ -833,6 +833,15 @@ fuel.controller.BaseFuelController = jqx.lib.BaseController.extend({
 	
 	lang : function(key){
 		return this.localized[key];
+	},
+
+	editModule: function(url, callback){
+		var _this = this;
+
+		var html = '<iframe src="' + url +'" id="add_round_iframe" class="inline_iframe" frameborder="0" scrolling="auto" style="border: none; height: 0px; width: 0px;"></iframe>';
+		var $modal = fuel.modalWindow(html, 'inline_edit_modal', true, null, callback);
+
+		return false;
 	}
 	
 	

From 3ce6b558aa18410ebccf376b849898385302c4d8 Mon Sep 17 00:00:00 2001
From: David McReynolds <dave@thedaylightstudio.com>
Date: Thu, 12 Jul 2018 11:00:12 -0700
Subject: [PATCH 073/129] Revised fix for issue #478

---
 fuel/modules/fuel/models/Base_module_model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fuel/modules/fuel/models/Base_module_model.php b/fuel/modules/fuel/models/Base_module_model.php
index ade7e4a4f..41071c264 100644
--- a/fuel/modules/fuel/models/Base_module_model.php
+++ b/fuel/modules/fuel/models/Base_module_model.php
@@ -451,7 +451,7 @@ protected function _list_items_query()
 				{
 					//$method = ($joiner == 'or') ? 'or_like' : 'like';
 					//$this->db->$method('LOWER('.$key.')', strtolower($val), 'both');
-					array_push($$joiner_arr, 'LOWER('.$key.') LIKE "%'.strtolower($this->db->escape($val)).'%"');
+					array_push($$joiner_arr, 'LOWER('.$key.') LIKE "%'.strtolower(addslashes($val)).'%"');
 				}
 			}
 		}

From 6afb54223496e841f23d36e9974e43a21aed1ddd Mon Sep 17 00:00:00 2001
From: David McReynolds <dave@thedaylightstudio.com>
Date: Thu, 12 Jul 2018 14:57:11 -0700
Subject: [PATCH 074/129] Fix for issue maintaining ratio on Fuel_assets

---
 fuel/modules/fuel/libraries/Fuel_assets.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/fuel/modules/fuel/libraries/Fuel_assets.php b/fuel/modules/fuel/libraries/Fuel_assets.php
index b91b2da21..3250d623f 100644
--- a/fuel/modules/fuel/libraries/Fuel_assets.php
+++ b/fuel/modules/fuel/libraries/Fuel_assets.php
@@ -344,14 +344,15 @@ public function upload($params = array())
 				}
 			}
 
+			// set maintain ratio if it is set to maintain_ratio
+			if ((!empty($params['resize_method']) AND $params['resize_method'] == 'maintain_ratio'))
+			{
+				$params['maintain_ratio'] = TRUE;
+			}
+			
 			$_params[$key] = $params;
 		}
 
-		// set maintain ratio if it is set to maintain_ratio
-		if ((!empty($params['resize_method']) AND $params['resize_method'] == 'maintain_ratio'))
-		{
-			$params['maintain_ratio'] = TRUE;
-		}
 
 		// now loop through the uploaded files to do any further image processing
 		foreach($this->_data as $key => $file)

From ce16ca09116f1df3d8d3d7eeca8ee1daec9f8ede Mon Sep 17 00:00:00 2001
From: David McReynolds <dave@thedaylightstudio.com>
Date: Tue, 24 Jul 2018 13:20:26 -0700
Subject: [PATCH 075/129] Added like parameter for embedded list view

---
 fuel/modules/fuel/models/Base_module_model.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/fuel/modules/fuel/models/Base_module_model.php b/fuel/modules/fuel/models/Base_module_model.php
index 41071c264..b485dd325 100644
--- a/fuel/modules/fuel/models/Base_module_model.php
+++ b/fuel/modules/fuel/models/Base_module_model.php
@@ -1197,6 +1197,13 @@ public function get_embedded_list_items($params, $list_cols = array(), $actions
 			}
 		}
 
+		if (!empty($params['like']))
+		{
+			$key = key($params['like']);
+			$val = current($params['like']);
+			$this->db->like($key, $val, 'both');
+		}
+		
 		$list_items = $this->list_items();
 		if (empty($list_items))
 		{

From 5ed1b3a2933441d87e511e1c810b75a84e5cf47c Mon Sep 17 00:00:00 2001
From: David McReynolds <dave@thedaylightstudio.com>
Date: Mon, 30 Jul 2018 13:47:35 -0700
Subject: [PATCH 076/129] Fix for issue #479 strtolower to mb_strtolower

---
 fuel/modules/fuel/models/Base_module_model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fuel/modules/fuel/models/Base_module_model.php b/fuel/modules/fuel/models/Base_module_model.php
index b485dd325..23c1d1d89 100644
--- a/fuel/modules/fuel/models/Base_module_model.php
+++ b/fuel/modules/fuel/models/Base_module_model.php
@@ -451,7 +451,7 @@ protected function _list_items_query()
 				{
 					//$method = ($joiner == 'or') ? 'or_like' : 'like';
 					//$this->db->$method('LOWER('.$key.')', strtolower($val), 'both');
-					array_push($$joiner_arr, 'LOWER('.$key.') LIKE "%'.strtolower(addslashes($val)).'%"');
+					array_push($$joiner_arr, 'LOWER('.$key.') LIKE "%'.mb_strtolower(addslashes($val)).'%"');
 				}
 			}
 		}

From 09ccd9ef49c74e2db12826d151f98b22841d7dc8 Mon Sep 17 00:00:00 2001
From: David McReynolds <dave@thedaylightstudio.com>
Date: Fri, 10 Aug 2018 15:17:52 -0700
Subject: [PATCH 077/129] Moved composer.json per issue #476

---
 composer.json => fuel/application/composer.json | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename composer.json => fuel/application/composer.json (100%)

diff --git a/composer.json b/fuel/application/composer.json
similarity index 100%
rename from composer.json
rename to fuel/application/composer.json

From b88571c956b858a2bddb87a15904026a69dc19cc Mon Sep 17 00:00:00 2001
From: Martynas Sateika <martynas.sateika@gmail.com>
Date: Wed, 22 Aug 2018 23:58:43 +0100
Subject: [PATCH 078/129] Correct a number of typos

---
 fuel/application/config/MY_fuel.php           |  2 +-
 fuel/application/config/asset.php             |  2 +-
 fuel/application/views/_install.php           |  4 ++--
 fuel/install/fuel_schema.sql                  |  4 ++--
 .../models/articles_model.php                 |  2 +-
 .../models/authors_model.php                  |  2 +-
 fuel/modules/fuel/config/fuel.php             |  2 +-
 fuel/modules/fuel/controllers/Build.php       |  2 +-
 fuel/modules/fuel/controllers/Dashboard.php   |  2 +-
 fuel/modules/fuel/controllers/Login.php       |  2 +-
 fuel/modules/fuel/controllers/Migrate.php     |  2 +-
 fuel/modules/fuel/controllers/Module.php      | 18 +++++++-------
 fuel/modules/fuel/controllers/My_profile.php  |  2 +-
 .../modules/fuel/core/MY_DB_mysqli_driver.php |  2 +-
 fuel/modules/fuel/core/MY_Model.php           | 22 ++++++++---------
 fuel/modules/fuel/core/Router.php             |  4 ++--
 .../fuel/helpers/MY_directory_helper.php      |  2 +-
 fuel/modules/fuel/helpers/MY_html_helper.php  |  4 ++--
 .../fuel/helpers/MY_language_helper.php       |  6 ++---
 .../modules/fuel/helpers/MY_string_helper.php |  4 ++--
 fuel/modules/fuel/helpers/asset_helper.php    |  4 ++--
 fuel/modules/fuel/helpers/markdown_helper.php | 20 ++++++++--------
 fuel/modules/fuel/helpers/utility_helper.php  |  2 +-
 fuel/modules/fuel/hooks/Fuel_hooks.php        |  2 +-
 .../fuel/language/english/fuel_lang.php       |  6 ++---
 fuel/modules/fuel/libraries/Asset.php         |  4 ++--
 fuel/modules/fuel/libraries/Cache.php         |  4 ++--
 fuel/modules/fuel/libraries/Curl.php          |  8 +++----
 fuel/modules/fuel/libraries/Form.php          |  2 +-
 fuel/modules/fuel/libraries/Form_builder.php  | 24 +++++++++----------
 fuel/modules/fuel/libraries/Fuel.php          |  2 +-
 fuel/modules/fuel/libraries/Fuel_admin.php    | 12 +++++-----
 .../fuel/libraries/Fuel_advanced_module.php   | 14 +++++------
 fuel/modules/fuel/libraries/Fuel_assets.php   |  4 ++--
 fuel/modules/fuel/libraries/Fuel_cache.php    |  2 +-
 .../modules/fuel/libraries/Fuel_installer.php |  6 ++---
 fuel/modules/fuel/libraries/Fuel_language.php |  4 ++--
 fuel/modules/fuel/libraries/Fuel_layouts.php  |  4 ++--
 fuel/modules/fuel/libraries/Fuel_logs.php     |  2 +-
 fuel/modules/fuel/libraries/Fuel_modules.php  | 14 +++++------
 .../fuel/libraries/Fuel_navigation.php        |  2 +-
 fuel/modules/fuel/libraries/Fuel_pages.php    | 10 ++++----
 fuel/modules/fuel/libraries/Fuel_parser.php   |  2 +-
 .../fuel/libraries/Fuel_permissions.php       |  4 ++--
 fuel/modules/fuel/libraries/Fuel_posts.php    |  2 +-
 .../modules/fuel/libraries/Fuel_redirects.php |  2 +-
 fuel/modules/fuel/libraries/Fuel_users.php    |  2 +-
 fuel/modules/fuel/libraries/Inspection.php    |  8 +++----
 fuel/modules/fuel/libraries/MY_Typography.php |  4 ++--
 fuel/modules/fuel/libraries/Menu.php          |  8 +++----
 fuel/modules/fuel/libraries/Unzip.php         |  4 ++--
 fuel/modules/fuel/libraries/Validator.php     |  2 +-
 .../modules/fuel/models/Base_module_model.php |  8 +++----
 fuel/modules/fuel/models/Base_posts_model.php |  4 ++--
 .../modules/fuel/models/Fuel_assets_model.php |  4 ++--
 .../fuel/models/Fuel_categories_model.php     |  4 ++--
 .../fuel/models/Fuel_navigation_model.php     | 10 ++++----
 fuel/modules/fuel/models/Fuel_pages_model.php |  4 ++--
 fuel/modules/fuel/models/Fuel_tags_model.php  |  2 +-
 fuel/modules/fuel/models/Fuel_users_model.php |  6 ++---
 fuel/modules/fuel/tests/Asset_test.php        |  4 ++--
 fuel/modules/fuel/tests/My_model_test.php     |  2 +-
 .../fuel/tests/sql/test_fuel_schema.sql       |  4 ++--
 .../fuel/views/_blocks/inline_edit_bar.php    |  2 +-
 .../fuel/views/_docs/general/constants.php    |  2 +-
 .../fuel/views/_docs/general/dashboards.php   |  2 +-
 .../fuel/views/_docs/general/extending.php    |  2 +-
 .../fuel/views/_docs/general/forms.php        |  2 +-
 .../views/_docs/general/inline-editing.php    |  2 +-
 .../fuel/views/_docs/general/javascript.php   |  8 +++----
 .../fuel/views/_docs/general/layouts.php      | 10 ++++----
 .../fuel/views/_docs/general/localization.php |  6 ++---
 .../modules/fuel/views/_docs/general/logs.php |  2 +-
 .../fuel/views/_docs/general/models.php       |  8 +++----
 .../fuel/views/_docs/general/navigation.php   |  2 +-
 .../_docs/general/opt-in-controllers.php      |  4 ++--
 .../views/_docs/general/pages-variables.php   |  4 ++--
 .../fuel/views/_docs/general/redirects.php    |  6 ++---
 .../fuel/views/_docs/general/security.php     |  2 +-
 .../views/_docs/general/tags-categories.php   |  2 +-
 .../views/_docs/general/template-parsing.php  |  8 +++----
 .../views/_docs/helpers/markdown_helper.php   |  4 ++--
 fuel/modules/fuel/views/_docs/index.php       |  2 +-
 .../views/_docs/introduction/interface.php    |  2 +-
 .../views/_docs/introduction/what-is-fuel.php |  2 +-
 .../views/_docs/introduction/whats-new.php    |  4 ++--
 .../_docs/libraries/fuel_base_controller.php  |  2 +-
 .../views/_docs/libraries/my_typography.php   |  2 +-
 fuel/modules/fuel/views/_docs/modules.php     |  2 +-
 .../fuel/views/_docs/modules/advanced.php     |  2 +-
 .../fuel/views/_docs/modules/generate.php     |  4 ++--
 .../fuel/views/_docs/modules/hooks.php        |  2 +-
 .../fuel/views/_docs/modules/simple.php       |  4 ++--
 .../fuel/views/_docs/modules/tutorial.php     |  8 +++----
 .../views/_generate/model/Events_model.php    |  2 +-
 .../fuel/views/_generate/model/News_model.php |  2 +-
 .../_generate/model/{Model_name}_model.php    |  2 +-
 fuel/modules/fuel/views/dashboard_ajax.php    |  4 ++--
 98 files changed, 228 insertions(+), 228 deletions(-)

diff --git a/fuel/application/config/MY_fuel.php b/fuel/application/config/MY_fuel.php
index 3203676ac..ed4ee8a77 100644
--- a/fuel/application/config/MY_fuel.php
+++ b/fuel/application/config/MY_fuel.php
@@ -32,7 +32,7 @@
 // shows an alert in the admin backend if this is the admin password
 $config['default_pwd'] = 'admin';
 
-// maximum number of paramters that can be passed to the page. Used to cut down on queries to the db.
+// maximum number of parameters that can be passed to the page. Used to cut down on queries to the db.
 // If it is an array, then it will loop through the array using the keys to match against a regular expression:
 // $config['max_page_params'] = array('about/news/' => 1);
 $config['max_page_params'] = 0;
diff --git a/fuel/application/config/asset.php b/fuel/application/config/asset.php
index 995b6e464..473358044 100644
--- a/fuel/application/config/asset.php
+++ b/fuel/application/config/asset.php
@@ -45,7 +45,7 @@
 YOU MUST use the assets_last_updated to refresh the cache file
 
 options: 
-* FALSE - no optimation
+* FALSE - no optimization
 * TRUE - will combine files, strip whitespace, and gzip
 * "inline" - will render the files inline
 * "gzip" - will combine files (if multiple) and gzip without stripping whitespace
diff --git a/fuel/application/views/_install.php b/fuel/application/views/_install.php
index e29adeaaf..bbfc13815 100644
--- a/fuel/application/views/_install.php
+++ b/fuel/application/views/_install.php
@@ -159,7 +159,7 @@ function svg_icon($id, $width, $height, $viewbox = "0 0 126.962 115.395")
 							<h4>Make configuration changes</h4>
 							<ul class="writable">
 								<?php if ($this->config->item('encryption_key') == '') : ?>
-								<li>In the <strong>fuel/application/config/config.php</strong>, change the <code>$config['encryption_key']</code> to your own unique key.</li></li>
+								<li>In the <strong>fuel/application/config/config.php</strong>, change the <code>$config['encryption_key']</code> to your own unique key.</li>
 								<?php endif; ?>
 								<?php if (!$this->config->item('admin_enabled', 'fuel')) : ?>
 								<li>In the <strong>fuel/application/config/MY_fuel.php</strong> file, change the <code>$config['admin_enabled']</code> configuration property to <code>TRUE</code>. If you do not want the CMS accessible, leave it as <strong>FALSE</strong>.</li>
@@ -222,7 +222,7 @@ function svg_icon($id, $width, $height, $viewbox = "0 0 126.962 115.395")
 						</div>
 						<div class="content_block">
 							<h4>Get rolling</h4>
-							<p>FUEL CMS is open source and on GitHub for a good reason. The communities involvement is an important part of it's success.
+							<p>FUEL CMS is open source and on GitHub for a good reason. The communities involvement is an important part of its success.
 							If you have any ideas for improvement, or even better, a <a href="https://help.github.com/articles/creating-a-pull-request" target="_blank">GitHub pull request</a>, please let us know.</p>
 
 
diff --git a/fuel/install/fuel_schema.sql b/fuel/install/fuel_schema.sql
index 327e8492f..720068291 100644
--- a/fuel/install/fuel_schema.sql
+++ b/fuel/install/fuel_schema.sql
@@ -75,7 +75,7 @@ CREATE TABLE `fuel_logs` (
 
 CREATE TABLE `fuel_navigation` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `location` varchar(255) COLLATE utf8_unicode_ci NOT NULL COMMENT 'The part of the path after the domain name that you want the link to go to (e.g. comany/about_us)',
+  `location` varchar(255) COLLATE utf8_unicode_ci NOT NULL COMMENT 'The part of the path after the domain name that you want the link to go to (e.g. company/about_us)',
   `group_id` int(5) unsigned NOT NULL DEFAULT '1',
   `nav_key` varchar(255) COLLATE utf8_unicode_ci NOT NULL COMMENT 'The nav key is a friendly ID that you can use for setting the selected state. If left blank, a default value will be set for you.',
   `label` varchar(255) COLLATE utf8_unicode_ci NOT NULL COMMENT 'The name you want to appear in the menu',
@@ -135,7 +135,7 @@ CREATE TABLE `fuel_pages` (
   `location` varchar(255) COLLATE utf8_unicode_ci NOT NULL COMMENT 'Add the part of the url after the root of your site (usually after the domain name). For the homepage, just put the word ''home''',
   `layout` varchar(50) COLLATE utf8_unicode_ci NOT NULL COMMENT 'The name of the template to associate with this page',
   `published` enum('yes','no') COLLATE utf8_unicode_ci NOT NULL DEFAULT 'yes' COMMENT 'A ''yes'' value will display the page and an ''no'' value will give a 404 error message',
-  `cache` enum('yes','no') COLLATE utf8_unicode_ci NOT NULL DEFAULT 'yes' COMMENT 'Cache controls whether the page will pull from the database or from a saved file which is more effeicent. If a page has content that is dynamic, it''s best to set cache to ''no''',
+  `cache` enum('yes','no') COLLATE utf8_unicode_ci NOT NULL DEFAULT 'yes' COMMENT 'Cache controls whether the page will pull from the database or from a saved file which is more efficient. If a page has content that is dynamic, it''s best to set cache to ''no''',
   `date_added` datetime DEFAULT NULL,
   `last_modified` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   `last_modified_by` int(10) unsigned NOT NULL,
diff --git a/fuel/modules/fuel/assets/docs/fuel_modules_example/models/articles_model.php b/fuel/modules/fuel/assets/docs/fuel_modules_example/models/articles_model.php
index 06df44e9f..2bf98c937 100755
--- a/fuel/modules/fuel/assets/docs/fuel_modules_example/models/articles_model.php
+++ b/fuel/modules/fuel/assets/docs/fuel_modules_example/models/articles_model.php
@@ -10,7 +10,7 @@ class Articles_model extends Base_module_model {
 	public $filter_join = 'or'; // how to combine the filters in the query (and or or)
 	public $required = array('title'); // an array of required fields. If a key => val is provided, the key is name of the field and the value is the error message to display
 	public $foreign_keys = array('author_id' => 'authors_model'); // map foreign keys to table models
-	public $linked_fields = array(); // fields that are linked meaning one value helps to determine another. Key is the field, value is a function name to transform it. (e.g. array('slug' => 'title'), or array('slug' => arry('name' => 'strtolower')));
+	public $linked_fields = array(); // fields that are linked meaning one value helps to determine another. Key is the field, value is a function name to transform it. (e.g. array('slug' => 'title'), or array('slug' => array('name' => 'strtolower')));
 	public $boolean_fields = array(); // fields that are tinyint and should be treated as boolean
 	public $unique_fields = array('slug'); // fields that are not IDs but are unique. Can also be an array of arrays for compound keys
 	public $parsed_fields = array(); // fields to automatically parse
diff --git a/fuel/modules/fuel/assets/docs/fuel_modules_example/models/authors_model.php b/fuel/modules/fuel/assets/docs/fuel_modules_example/models/authors_model.php
index 32366b6b4..f4661e9d0 100755
--- a/fuel/modules/fuel/assets/docs/fuel_modules_example/models/authors_model.php
+++ b/fuel/modules/fuel/assets/docs/fuel_modules_example/models/authors_model.php
@@ -9,7 +9,7 @@ class Authors_model extends Base_module_model {
 	public $filters = array('name', 'email'); // filters to apply to when searching for items
 	public $required = array('name', 'email'); // an array of required fields. If a key => val is provided, the key is name of the field and the value is the error message to display
 	public $foreign_keys = array(); // map foreign keys to table models
-	public $linked_fields = array(); // fields that are linked meaning one value helps to determine another. Key is the field, value is a function name to transform it. (e.g. array('slug' => 'title'), or array('slug' => arry('name' => 'strtolower')));
+	public $linked_fields = array(); // fields that are linked meaning one value helps to determine another. Key is the field, value is a function name to transform it. (e.g. array('slug' => 'title'), or array('slug' => array('name' => 'strtolower')));
 	public $boolean_fields = array(); // fields that are tinyint and should be treated as boolean
 	public $unique_fields = array(); // fields that are not IDs but are unique. Can also be an array of arrays for compound keys
 	public $parsed_fields = array(); // fields to automatically parse
diff --git a/fuel/modules/fuel/config/fuel.php b/fuel/modules/fuel/config/fuel.php
index fd2fce65e..eca035c8b 100644
--- a/fuel/modules/fuel/config/fuel.php
+++ b/fuel/modules/fuel/config/fuel.php
@@ -348,7 +348,7 @@
 // The name of the group the cache is associated with (so you can just remove the group)
 $config['page_cache_group'] = 'pages';
 
-// Maximum number of paramters that can be passed to the page. Used to cut down on queries to the db.
+// Maximum number of parameters that can be passed to the page. Used to cut down on queries to the db.
 // If it is an array, then it will loop through the array using the keys to match against a regular expression:
 // $config['max_page_params'] = array('about/news/' => 1);
 $config['max_page_params'] = 0;
diff --git a/fuel/modules/fuel/controllers/Build.php b/fuel/modules/fuel/controllers/Build.php
index a18429271..024c085c4 100644
--- a/fuel/modules/fuel/controllers/Build.php
+++ b/fuel/modules/fuel/controllers/Build.php
@@ -47,7 +47,7 @@ function _remap($module, $segs = NULL)
 			// explode on colon to separate the folder name from the file name
 			$seg_parts = explode(':', $segs_str);
 
-			// set the folder name to lookin
+			// set the folder name to look in
 			$folder = $seg_parts[0];
 
 			// set the file name if one exists
diff --git a/fuel/modules/fuel/controllers/Dashboard.php b/fuel/modules/fuel/controllers/Dashboard.php
index 9a617eee8..d21fa9bb7 100644
--- a/fuel/modules/fuel/controllers/Dashboard.php
+++ b/fuel/modules/fuel/controllers/Dashboard.php
@@ -39,7 +39,7 @@ public function ajax()
 			$this->load->helper('simplepie');
 			$this->load->module_model(FUEL_FOLDER, 'fuel_pages_model');
 			$this->load->module_model(FUEL_FOLDER, 'fuel_logs_model');
-			$vars['recently_modifed_pages'] = $this->fuel_pages_model->find_all_array(array(), 'last_modified desc', 10);
+			$vars['recently_modified_pages'] = $this->fuel_pages_model->find_all_array(array(), 'last_modified desc', 10);
 			$vars['latest_activity'] = $this->fuel_logs_model->latest_activity(10);
 
 			if (file_exists(APPPATH.'/views/_docs/fuel'.EXT))
diff --git a/fuel/modules/fuel/controllers/Login.php b/fuel/modules/fuel/controllers/Login.php
index cdf046ca2..a6cd128b1 100644
--- a/fuel/modules/fuel/controllers/Login.php
+++ b/fuel/modules/fuel/controllers/Login.php
@@ -28,7 +28,7 @@ public function __construct()
 
 		$this->load->module_model(FUEL_FOLDER, 'fuel_users_model');
 
-		// set configuration paths for assets in case they are differernt from front end
+		// set configuration paths for assets in case they are different from front end
 		$this->asset->assets_module ='fuel';
 		$this->asset->assets_folders = array(
 				'images' => 'images/',
diff --git a/fuel/modules/fuel/controllers/Migrate.php b/fuel/modules/fuel/controllers/Migrate.php
index 5772e191a..c4881a40b 100644
--- a/fuel/modules/fuel/controllers/Migrate.php
+++ b/fuel/modules/fuel/controllers/Migrate.php
@@ -50,7 +50,7 @@ public function version($version = 1, $module = NULL)
 	{
 		$this->_init_migrate($module);
 
-		// must be in dev mode change the version to something uther then the latest or current
+		// must be in dev mode change the version to something other then the latest or current
 		if ( ! is_dev_mode())
 		{
 			$this->_show_error(lang('error_not_in_dev_mode'));
diff --git a/fuel/modules/fuel/controllers/Module.php b/fuel/modules/fuel/controllers/Module.php
index c74b62f3b..ed24dbc91 100644
--- a/fuel/modules/fuel/controllers/Module.php
+++ b/fuel/modules/fuel/controllers/Module.php
@@ -806,7 +806,7 @@ function items_precedence()
 	 * Displays the fields to create a record (form view)
 	 *
 	 * @access	public
-	 * @param	string	The name of a field, or fields spearated by colon to display in the form (optional)
+	 * @param	string	The name of a field, or fields separated by colon to display in the form (optional)
 	 * @param	string	Determines whether to redirect the page after save or not
 	 * @return	void
 	 */	
@@ -892,7 +892,7 @@ function create($field = NULL, $redirect = TRUE)
 	 * The same as the create method but does not show the left menu
 	 *
 	 * @access	public
-	 * @param	string	The name of a field, or fields spearated by colon to display in the form (optional)
+	 * @param	string	The name of a field, or fields separated by colon to display in the form (optional)
 	 * @param	string	Determines whether to redirect the page after save or not
 	 * @return	void
 	 */	
@@ -1023,7 +1023,7 @@ protected function _process_create()
 	 *
 	 * @access	public
 	 * @param	int		The ID value of the record to edit
-	 * @param	string	The name of a field, or fields spearated by colon to display in the form (optional)
+	 * @param	string	The name of a field, or fields separated by colon to display in the form (optional)
 	 * @param	string	Determines whether to redirect the page after save or not
 	 * @return	void
 	 */	
@@ -1142,7 +1142,7 @@ function edit($id = NULL, $field = NULL, $redirect = TRUE)
 	 *
 	 * @access	public
 	 * @param	int		The ID value of the record to edit
-	 * @param	string	The name of a field, or fields spearated by colon to display in the form (optional)
+	 * @param	string	The name of a field, or fields separated by colon to display in the form (optional)
 	 * @return	void
 	 */	
 	function inline_edit($id = NULL, $field = NULL)
@@ -1260,7 +1260,7 @@ protected function _sanitize($data)
 						}
 						else
 						{
-							// loop through sanitzation functions 
+							// loop through sanitization functions 
 							foreach($sanitize_input as $func)
 							{
 								$func = (isset($valid_funcs[$func])) ? $valid_funcs[$func] : FALSE;
@@ -1275,7 +1275,7 @@ protected function _sanitize($data)
 				}
 				else
 				{
-					// loop through sanitzation functions 
+					// loop through sanitization functions 
 					foreach($sanitize_input as $key => $val)
 					{
 						$func = (isset($valid_funcs[$val])) ? $valid_funcs[$val] : FALSE;
@@ -1352,7 +1352,7 @@ protected function _saved_data($id)
 		return $saved;
 	}
 	
-	// seperated to make it easier in subclasses to use the form without rendering the page
+	// separated to make it easier in subclasses to use the form without rendering the page
 	protected function _form_vars($id = NULL, $values = array(), $field = NULL, $inline = FALSE)
 	{
 
@@ -2074,13 +2074,13 @@ function export()
 		}
 	}
 
-	// used in list view to quickly unpublish (if they have permisison)
+	// used in list view to quickly unpublish (if they have permission)
 	function toggle_on($id = NULL, $field = 'published')
 	{
 		$this->_toggle($id, $field, 'on');
 	}
 
-	// used in list view to quickly publish (if they have permisison)
+	// used in list view to quickly publish (if they have permission)
 	function toggle_off($id = NULL, $field = 'published')
 	{
 		$this->_toggle($id, $field, 'off');
diff --git a/fuel/modules/fuel/controllers/My_profile.php b/fuel/modules/fuel/controllers/My_profile.php
index 998f63241..aaa0b784c 100644
--- a/fuel/modules/fuel/controllers/My_profile.php
+++ b/fuel/modules/fuel/controllers/My_profile.php
@@ -37,7 +37,7 @@ public function edit()
 		$this->_form($id);
 	}
 
-	// seperated to make it easier in subclasses to use the form without rendering the page
+	// separated to make it easier in subclasses to use the form without rendering the page
 	public function _form($id = null)
 	{
 		$this->load->library('form_builder');
diff --git a/fuel/modules/fuel/core/MY_DB_mysqli_driver.php b/fuel/modules/fuel/core/MY_DB_mysqli_driver.php
index e9ec41a38..de057ebe9 100644
--- a/fuel/modules/fuel/core/MY_DB_mysqli_driver.php
+++ b/fuel/modules/fuel/core/MY_DB_mysqli_driver.php
@@ -426,7 +426,7 @@ public function start_group_where($key, $value = NULL, $escape = NULL, $type = "
 	}
 
 	/**
-	 * Strictly used to have a consistent close function as the start_group_where. This essentially callse the close_bracket() function. 
+	 * Strictly used to have a consistent close function as the start_group_where. This essentially calls the close_bracket() function.
 	 */
 	public function close_group_where()
 	{
diff --git a/fuel/modules/fuel/core/MY_Model.php b/fuel/modules/fuel/core/MY_Model.php
index fc2040c5b..71b55a938 100755
--- a/fuel/modules/fuel/core/MY_Model.php
+++ b/fuel/modules/fuel/core/MY_Model.php
@@ -55,7 +55,7 @@ class MY_Model extends CI_Model {
 	public $readonly = FALSE; // sets the model to readonly mode where you can't save or delete data
 	public $hidden_fields = array(); // fields to hide when creating a form
 	public $unique_fields = array(); // fields that are not IDs but are unique. Can also be an array of arrays for compound keys
-	public $linked_fields = array(); // fields that are linked meaning one value helps to determine another. Key is the field, value is a function name to transform it. (e.g. array('slug' => 'title'), or array('slug' => arry('name' => 'strtolower')));
+	public $linked_fields = array(); // fields that are linked meaning one value helps to determine another. Key is the field, value is a function name to transform it. (e.g. array('slug' => 'title'), or array('slug' => array('name' => 'strtolower')));
 	public $serialized_fields = array(); // fields that contain serialized data. This will automatically serialize before saving and unserialize data upon retrieving
 	public $default_serialization_method = 'json'; // the default serialization method. Options are 'json' and 'serialize'
 	public $boolean_fields = array(); // fields that are tinyint and should be treated as boolean
@@ -250,7 +250,7 @@ public function short_name($lower = FALSE, $record_class = FALSE)
 	// --------------------------------------------------------------------
 	
 	/**
-	 * Gets the name of the model object. By default it will be the same as the short_name(FALSE, FALSE) if no "friendly_name" value is specfied on the model
+	 * Gets the name of the model object. By default it will be the same as the short_name(FALSE, FALSE) if no "friendly_name" value is specified on the model
 	 *
 	 <code>
 	echo $this->examples_model->friendly_name(TRUE); 
@@ -279,7 +279,7 @@ public function friendly_name($lower = FALSE)
 	// --------------------------------------------------------------------
 	
 	/**
-	 * Gets the singular name of the model object. By default it will be the same as the short_name(FALSE, TRUE) if no "singular_name" value is specfied on the model
+	 * Gets the singular name of the model object. By default it will be the same as the short_name(FALSE, TRUE) if no "singular_name" value is specified on the model
 	 *
 	 <code>
 	echo $this->examples_model->singular_name(TRUE); 
@@ -1434,7 +1434,7 @@ public function cleaned_data()
 	 *
 	 <code>
 	$where['published'] = 'yes';
-	echo $this->examples_model->record_count($where); // dislays the number of records
+	echo $this->examples_model->record_count($where); // displays the number of records
 	</code>
 	 *
 	 * @access	public
@@ -2734,7 +2734,7 @@ public function comment()
 	 *
 	 * Somewhat similar to the table_info method with difference being that the returned array has information for creating a form.
 	 * The related parameter is used to conveniently map other model information with this form to create a many to many multi-select form element.
-	 * This method is usally used with the <a href="<?=user_guide_url('libraries/form_builder')?>">Form_builder</a> class.
+	 * This method is usually used with the <a href="<?=user_guide_url('libraries/form_builder')?>">Form_builder</a> class.
 	 *
 	 <code>
 	$form_info = $this->examples_model->form_fields(); 
@@ -3204,7 +3204,7 @@ public function normalize_save_values($record = NULL)
 	// --------------------------------------------------------------------
 	
 	/**
-	 * Normailzes the data passed to it so that it becomes an array (used by the normalize_save_values)
+	 * Normalizes the data passed to it so that it becomes an array (used by the normalize_save_values)
 	 *
 	 <code>
 	$record = $this->examples_model->create(); 
@@ -4621,7 +4621,7 @@ public function __toString(){
  * 
  * The Data_record class is used to create custom record objects for a Table class (MY_Model). 
  * Data_record objects provides a greater level of flexibility with your models by allowing you to create not only
- * methods on your model to retreive records from your datasource, but also the ability to create
+ * methods on your model to retrieve records from your datasource, but also the ability to create
  * derived attributes and lazy load other objects with each record returned.
  * This class is <strong>optional</strong>. If it it doesn't exist, then the Table Class parent model
  * will use either a standard generic class or an array depending on the return method specified.
@@ -4693,7 +4693,7 @@ public function initialize(&$parent, $fields = array())
 	// --------------------------------------------------------------------
 	
 	/**
-	 * This method returns either <dfn>TRUE</dfn> or <dfn>FALSE</dfn> depending on if the record class has been properly intialized.
+	 * This method returns either <dfn>TRUE</dfn> or <dfn>FALSE</dfn> depending on if the record class has been properly initialized.
 	 *
 	 <code>
 	$record = $this->examples_model->create(); 
@@ -4811,7 +4811,7 @@ public function fill($values = array())
 	</code>
 	 *
 	 * @access	public
-	 * @param	boolean Determins whether to include derived attributes (those starting with get_)
+	 * @param	boolean Determines whether to include derived attributes (those starting with get_)
 	 * @return	array
 	 */	
 	public function values($include_derived = FALSE)
@@ -6005,7 +6005,7 @@ public function on_init()
 	// --------------------------------------------------------------------
 	
 	/**
-	 * This method returns either <dfn>TRUE</dfn> or <dfn>FALSE</dfn> depending on if the field class has been properly intialized.
+	 * This method returns either <dfn>TRUE</dfn> or <dfn>FALSE</dfn> depending on if the field class has been properly initialized.
 	 *
 	 * @access	public
 	 * @return	boolean
@@ -6060,7 +6060,7 @@ public function is_empty()
 	 * Placeholder - to execute after a magic method get
 	 *
 	 * @access	public
-	 * @param	string	output from get comand
+	 * @param	string	output from get command
 	 * @param	string	field name
 	 * @return	mixed
 	 */	
diff --git a/fuel/modules/fuel/core/Router.php b/fuel/modules/fuel/core/Router.php
index 089db9283..ac6739424 100644
--- a/fuel/modules/fuel/core/Router.php
+++ b/fuel/modules/fuel/core/Router.php
@@ -16,7 +16,7 @@
 /**
  * Some additions to the Awesome Modular Extension Library mostly for Matchbox compatibility
  *
- * This Library overides the original MX Loader library
+ * This Library overrides the original MX Loader library
  *
  * @package		FUEL CMS
  * @subpackage	Third Party
@@ -126,7 +126,7 @@ protected function _parse_routes()
 				{
 					$val = preg_replace('#^'.$key.'$#', $val, $uri);
 				}
-				// Added by Daylight Studio 2014-12-23 to filter out any duplicate slashes which yeild empty segmeents
+				// Added by Daylight Studio 2014-12-23 to filter out any duplicate slashes which yield empty segments
 				$segs = array_values(array_filter(explode('/', $val)));
 				$this->_set_request($segs);
 				return;
diff --git a/fuel/modules/fuel/helpers/MY_directory_helper.php b/fuel/modules/fuel/helpers/MY_directory_helper.php
index b4e1ec09e..b00e42d1c 100644
--- a/fuel/modules/fuel/helpers/MY_directory_helper.php
+++ b/fuel/modules/fuel/helpers/MY_directory_helper.php
@@ -183,7 +183,7 @@ function directory_to_array($directory, $recursive = TRUE, $exclude = array(), $
 						$file_prefix = (!$append_path) ? substr($directory, strlen($orig_directory)) : $directory;
 						$file = $file_prefix."/".$file;
 						$file = str_replace("//", "/", $file); // replace double slash
-						if (substr($file, 0, 1) == '/') $file = substr($file, 1); // remove begining slash
+						if (substr($file, 0, 1) == '/') $file = substr($file, 1); // remove beginning slash
 						if (!empty($file) AND !in_array($file, $array_items)) $array_items[] = $file;
 					}
 					
diff --git a/fuel/modules/fuel/helpers/MY_html_helper.php b/fuel/modules/fuel/helpers/MY_html_helper.php
index 80ba604d6..436ded288 100644
--- a/fuel/modules/fuel/helpers/MY_html_helper.php
+++ b/fuel/modules/fuel/helpers/MY_html_helper.php
@@ -19,7 +19,7 @@
 /**
  * FUEL HTML Helper
  *
- * This helper is designed to provide assistence building custom html tags.
+ * This helper is designed to provide assistance in building custom HTML tags.
  * 
  *
  * @package		FUEL CMS
@@ -114,7 +114,7 @@ function quote($quote, $cite = NULL, $title = NULL, $class = 'quote')
 	 * Create HTML attributes
 	 *
 	 * @access	public
-	 * @param	mixed	HTML attributs
+	 * @param	mixed	HTML attributes
 	 * @return	string
 	 */
 	function html_attrs($attrs)
diff --git a/fuel/modules/fuel/helpers/MY_language_helper.php b/fuel/modules/fuel/helpers/MY_language_helper.php
index 5399d1d0f..345f8c175 100644
--- a/fuel/modules/fuel/helpers/MY_language_helper.php
+++ b/fuel/modules/fuel/helpers/MY_language_helper.php
@@ -35,7 +35,7 @@
 {
 	/**
 	 * Get translated local strings with arguments.
-	 * Overwrites CI langauge_helper to have a more useful args
+	 * Overwrites CI language_helper to have a more useful args
 	 *
 	 * @param	string
 	 * @param	mixed
@@ -71,7 +71,7 @@ function lang($key, $args = NULL)
 if (!function_exists('json_lang'))
 {
 	/**
-	 * Creates an array or JSON aobject for your javascript files that need localization
+	 * Creates an array or JSON object for your javascript files that need localization
 	 *
 	 * @param	array
 	 * @param	boolean
@@ -135,7 +135,7 @@ function json_lang($js_localized = array(), $return_json = TRUE)
 	/**
 	 * Detects any specified language settings pulling from the URI, query string and then the user's browser settings
 	 *
-	 * @param	boolean	Determines whether to set the "langauge" config property
+	 * @param	boolean	Determines whether to set the "language" config property
 	 * @return	string
 	 */
 	function detect_lang($set_config = FALSE)
diff --git a/fuel/modules/fuel/helpers/MY_string_helper.php b/fuel/modules/fuel/helpers/MY_string_helper.php
index 9607810a0..f217e276c 100644
--- a/fuel/modules/fuel/helpers/MY_string_helper.php
+++ b/fuel/modules/fuel/helpers/MY_string_helper.php
@@ -35,7 +35,7 @@
 if (!function_exists('eval_string'))
 {
 	/**
-	 * Evaluates a strings PHP code. Used especially for outputing FUEL page data
+	 * Evaluates a strings PHP code. Used especially for outputting FUEL page data
 	 *
 	 * @param	string	string to evaluate
 	 * @param	mixed	variables to pass to the string
@@ -275,7 +275,7 @@ function parse_template_syntax($str, $vars = array(), $engine = NULL, $config =
 {
 	$CI =& get_instance();
 
-	// for backwards compatability
+	// for backwards compatibility
 	if ($engine === TRUE)
 	{
 		$engine = 'ci';
diff --git a/fuel/modules/fuel/helpers/asset_helper.php b/fuel/modules/fuel/helpers/asset_helper.php
index 243fb4da0..60e424f67 100644
--- a/fuel/modules/fuel/helpers/asset_helper.php
+++ b/fuel/modules/fuel/helpers/asset_helper.php
@@ -408,11 +408,11 @@ function swf($flash, $id, $width, $height, $options = array()){
 	 */
 	function placeholder($width = 100, $height = '', $text = '', $colors = '', $img_tag = FALSE)
 	{
-		$dimentions = $width.( !empty($height) ? 'x'.$height : '');
+		$dimensions = $width.( !empty($height) ? 'x'.$height : '');
 		$text = !empty($text) ? '&text='.urlencode($text) : '';
 		$colors = !empty($colors) ? explode(' ', $colors) : '';
 		$colors = !empty($colors) ? '/'.$colors[0].'/'.$colors[1] : '';
-		$path = 'http://placehold.it/'.$dimentions.$colors.$text;
+		$path = 'http://placehold.it/'.$dimensions.$colors.$text;
 		if ($img_tag)
 		{
 			return '<img src="'.$path.'" alt="'.$text.'" width="'.$width.'" height="'.$height.'" />';
diff --git a/fuel/modules/fuel/helpers/markdown_helper.php b/fuel/modules/fuel/helpers/markdown_helper.php
index 5a763725f..f33244cec 100644
--- a/fuel/modules/fuel/helpers/markdown_helper.php
+++ b/fuel/modules/fuel/helpers/markdown_helper.php
@@ -193,7 +193,7 @@ function blockLite($text) { return $text; }
 class Markdown_Parser {
 
 	# Regex to match balanced [brackets].
-	# Needed to insert a maximum bracked depth while converting to PHP.
+	# Needed to insert a maximum bracket depth while converting to PHP.
 	var $nested_brackets_depth = 6;
 	var $nested_brackets_re;
 	
@@ -558,7 +558,7 @@ function runBlockGamut($text) {
 	#
 		# We need to escape raw HTML in Markdown source before doing anything 
 		# else. This need to be done for each block, and not only at the 
-		# begining in the Markdown function since hashed blocks can be part of
+		# beginning in the Markdown function since hashed blocks can be part of
 		# list items and could have been indented. Indented blocks would have 
 		# been seen as a code block in a previous pass of hashHTMLBlocks.
 		$text = $this->hashHTMLBlocks($text);
@@ -568,7 +568,7 @@ function runBlockGamut($text) {
 	
 	function runBasicBlockGamut($text) {
 	#
-	# Run block gamut tranformations, without hashing HTML blocks. This is 
+	# Run block gamut transformations, without hashing HTML blocks. This is
 	# useful when HTML blocks are known to be already hashed, like in the first
 	# whole-document pass.
 	#
@@ -627,7 +627,7 @@ function doHorizontalRules($text) {
 
 	function runSpanGamut($text) {
 	#
-	# Run span gamut tranformations.
+	# Run span gamut transformations.
 	#
 		foreach ($this->span_gamut as $method => $priority) {
 			$text = $this->$method($text);
@@ -937,7 +937,7 @@ function doLists($text) {
 			);
 
 		foreach ($markers_relist as $marker_re => $other_marker_re) {
-			# Re-usable pattern to match any entirel ul or ol list:
+			# Re-usable pattern to match any entirely ul or ol list:
 			$whole_list_re = '
 				(								# $1 = whole list
 				  (								# $2
@@ -1166,7 +1166,7 @@ function doItalicsAndBold($text) {
 		
 		while (1) {
 			#
-			# Get prepared regular expression for seraching emphasis tokens
+			# Get prepared regular expression for searching emphasis tokens
 			# in current context.
 			#
 			$token_re = $this->em_strong_prepared_relist["$em$strong"];
@@ -1529,8 +1529,8 @@ function parseSpan($str) {
 
 		while (1) {
 			#
-			# Each loop iteration seach for either the next tag, the next 
-			# openning code span marker, or the next escaped character. 
+			# Each loop iteration searches for either the next tag, the next
+			# opening code span marker, or the next escaped character.
 			# Each token is then passed to handleSpanToken.
 			#
 			$parts = preg_split($span_re, $str, 2, PREG_SPLIT_DELIM_CAPTURE);
@@ -1587,14 +1587,14 @@ function outdent($text) {
 
 
 	# String length function for detab. `_initDetab` will create a function to 
-	# hanlde UTF-8 if the default function does not exist.
+	# handle UTF-8 if the default function does not exist.
 	var $utf8_strlen = 'mb_strlen';
 	
 	function detab($text) {
 	#
 	# Replace tabs with the appropriate amount of space.
 	#
-		# For each line we separate the line in blocks delemited by
+		# For each line we separate the line in blocks delimited by
 		# tab characters. Then we reconstruct every line by adding the 
 		# appropriate number of space between each blocks.
 		
diff --git a/fuel/modules/fuel/helpers/utility_helper.php b/fuel/modules/fuel/helpers/utility_helper.php
index 41b5e0fb6..724f5fb14 100644
--- a/fuel/modules/fuel/helpers/utility_helper.php
+++ b/fuel/modules/fuel/helpers/utility_helper.php
@@ -163,7 +163,7 @@ function is_json_str($data)
 if (!function_exists('print_obj'))
 {
 	/**
-	 * Print object in human-readible format
+	 * Print object in human-readable format
 	 *
 	 * @param	mixed	The variable to dump
 	 * @param	boolean	Return string
diff --git a/fuel/modules/fuel/hooks/Fuel_hooks.php b/fuel/modules/fuel/hooks/Fuel_hooks.php
index b031f4ca7..fa835b976 100644
--- a/fuel/modules/fuel/hooks/Fuel_hooks.php
+++ b/fuel/modules/fuel/hooks/Fuel_hooks.php
@@ -94,7 +94,7 @@ public function offline()
 			if ($CI->fuel->config('offline') AND !$CI->fuel->auth->is_logged_in() AND (!preg_match('#^'.fuel_uri('login').'#', uri_path(FALSE))))
 			{
 
-				// By pass offline page if password inputed.
+				// By pass offline page if password inputted.
 				$CI->load->library('session');
 				if ($CI->session->userdata('dev_password'))
 				{
diff --git a/fuel/modules/fuel/language/english/fuel_lang.php b/fuel/modules/fuel/language/english/fuel_lang.php
index bfd2ea060..0c586799a 100644
--- a/fuel/modules/fuel/language/english/fuel_lang.php
+++ b/fuel/modules/fuel/language/english/fuel_lang.php
@@ -227,7 +227,7 @@
 $lang['module_update'] = "The module %1s has been updated in FUEL.\n";
 
 // build
-$lang['module_build_asset'] = "%1s optimized and ouput to %2s\n";
+$lang['module_build_asset'] = "%1s optimized and output to %2s\n";
 
 /*
 |--------------------------------------------------------------------------
@@ -551,7 +551,7 @@
 $lang['layout_field_redirect_to'] = 'Redirect to';
 
 $lang['layout_field_301_redirect_copy'] = 'This layout will do a 301 redirect to another page.';
-$lang['layout_field_alias_copy'] = 'This layout is similar to a 301 redirect but the location of the page does not change and <br />the page content from the specifiec location is used to render the page.';
+$lang['layout_field_alias_copy'] = 'This layout is similar to a 301 redirect but the location of the page does not change and <br />the page content from the specified location is used to render the page.';
 $lang['layout_field_sitemap_xml_copy'] = 'This layout is used to generate a sitemap. For this page to appear, a sitemap.xml must not exist on the server.';
 $lang['layout_field_robots_txt_copy'] = 'This layout is used to generate a robots.txt file. For this page to appear, a robots.txt must not exist on the server.';
 $lang['layout_field_none_copy'] = 'This layout is the equivalent of having no layout assigned.';
@@ -617,7 +617,7 @@
 $lang['install_cli_intro'] .= "3) Enable the CMS admin by changing the 'admin_enabled' config value in fuel/application/config/MY_fuel.php.\n";
 $lang['install_cli_intro'] .= "4) Change the 'fuel_mode' config value in in fuel/application/config/MY_fuel.php to allow for pages to be created in the CMS.\n";
 $lang['install_cli_intro'] .= "5) Change the 'site_name' config value in the fuel/application/config/MY_fuel.php.\n";
-$lang['install_cli_intro'] .= "6) Setup your evironments fuel/application/config/environments.php.\n";
+$lang['install_cli_intro'] .= "6) Setup your environments fuel/application/config/environments.php.\n";
 $lang['install_cli_intro'] .= "7) Will make the fuel/application/logs, fuel/application/cache and assets/images folders writable.\n";
 $lang['install_cli_intro'] .= "8) Update the fuel/application/config/database.php file with the inputted values.\n";
 $lang['install_cli_intro'] .= "9) Create a database and install the fuel_schema.sql file using your local MySQL connection.\n";
diff --git a/fuel/modules/fuel/libraries/Asset.php b/fuel/modules/fuel/libraries/Asset.php
index 929b431f4..928153284 100644
--- a/fuel/modules/fuel/libraries/Asset.php
+++ b/fuel/modules/fuel/libraries/Asset.php
@@ -21,7 +21,7 @@
  *
  * This class allows you to output css, js links and/or files as well as
  * allows you to compress and cache them. It also has convenience methods for 
- * paths to different assets like images, pdfs, javascript css etc.
+ * paths to different assets like images, PDFs, javascript css etc.
  * 
  * Additionally, you can use the <a href="[user_guide_url]helpers/asset">asset helper</a>
  * which provides a shortcut for many of the methods of the Asset class. 
@@ -1440,7 +1440,7 @@ public function optimize($files, $params = array())
 				// remove calls to the import since they are combined into the same css
 				if (!empty($import_files))
 				{
-					// temporarily put it in the global space so the anonymoous function can grab it
+					// temporarily put it in the global space so the anonymous function can grab it
 					$GLOBALS["__TMP_CSS_IMPORT__"] = $import_files;
 					$output = preg_replace_callback('/@import url\(([\'|"])*(.+)\\1\);/U', $callback, $output);
 					unset($GLOBALS["__TMP_CSS_IMPORT__"]);
diff --git a/fuel/modules/fuel/libraries/Cache.php b/fuel/modules/fuel/libraries/Cache.php
index 215f95346..c88aafd01 100644
--- a/fuel/modules/fuel/libraries/Cache.php
+++ b/fuel/modules/fuel/libraries/Cache.php
@@ -145,7 +145,7 @@ public function save($cache_id, $data, $cache_group = NULL, $ttl = NULL)
 
 		//
 		//	Ok, so setting ttl = 0 is not quite forever, but 1000 years
-		//	Is your PHP code going to be running for 1000 years? If so dont use this library (or just regenerate the cache then)!
+		//	Is your PHP code going to be running for 1000 years? If so don't use this library (or just regenerate the cache then)!
 		//
 		if ($ttl == 0) $ttl = 31536000000; //1000 years in seconds
 				
@@ -235,7 +235,7 @@ public function remove_group($cache_group)
 		
 		closedir($dh);
 		
-		//	Delete the dir for tidyness
+		//	Delete the dir for tidiness
 		@rmdir($group_dir);
 		
 	}
diff --git a/fuel/modules/fuel/libraries/Curl.php b/fuel/modules/fuel/libraries/Curl.php
index cd15b5eb9..74aa9ae48 100644
--- a/fuel/modules/fuel/libraries/Curl.php
+++ b/fuel/modules/fuel/libraries/Curl.php
@@ -222,7 +222,7 @@ public function set_options($opts, $key = 0)
 	 *
 	 * @access	public
 	 * @param	string	The key value of a CURL session. If none provided, it will execute all sessions in the stack (optional)
-	 * @param	boolean	Wether to clear out the sessions after execution. Default is TRUE (optional)
+	 * @param	boolean	Whether to clear out the sessions after execution. Default is TRUE (optional)
 	 * @return	string
 	 */	
 	public function exec($key = FALSE, $clear = TRUE)
@@ -259,7 +259,7 @@ public function exec($key = FALSE, $clear = TRUE)
 	 *
 	 * @access	public
 	 * @param	int	The key value of a CURL session. If none provided, it will execute all sessions in the stack (optional)
-	 * @param	boolean	Wether to clear out the sessions after execution. Default is TRUE (optional)
+	 * @param	boolean	Whether to clear out the sessions after execution. Default is TRUE (optional)
 	 * @return	string
 	 */	
 	public function exec_single($key = 0, $clear = TRUE)
@@ -300,7 +300,7 @@ public function exec_single($key = 0, $clear = TRUE)
 	 * Can be more efficient when doing a lot of CURL requests at once.
 	 *
 	 * @access	public
-	 * @param	boolean	Wether to clear out the sessions after execution. Default is TRUE (optional)
+	 * @param	boolean	Whether to clear out the sessions after execution. Default is TRUE (optional)
 	 * @param	int	The number to execute simultaneously. Default is 5 (optional)
 	 * @return	string
 	 */	
@@ -406,7 +406,7 @@ public function is_multi()
 	 * Returns information of an executed session.
 	 *
 	 * @access	public
-	 * @param	string	The name of the parameter to return. If no value is proviced, then all values will be returned (optional)
+	 * @param	string	The name of the parameter to return. If no value is provided, then all values will be returned (optional)
 	 * @param	mixed	The key value of a CURL session. If set to TRUE, then it will return all the infos from a mult-session (optional)
 	 * @return	mixed
 	 */	
diff --git a/fuel/modules/fuel/libraries/Form.php b/fuel/modules/fuel/libraries/Form.php
index be15d53bb..21fa4a546 100644
--- a/fuel/modules/fuel/libraries/Form.php
+++ b/fuel/modules/fuel/libraries/Form.php
@@ -271,7 +271,7 @@ public function text($name, $value = '', $attrs = '')
 	<code>
 	echo $this->form->hidden('password', 'abc134', 'class="txt_field"');
 	// will echo the following
-	<input type="passowrd" name="pwd" id="pwd"  value="" class="txt_field" />
+	<input type="password" name="pwd" id="pwd"  value="" class="txt_field" />
 	</code>
 	 * @access public
 	 * @param string name of the input element
diff --git a/fuel/modules/fuel/libraries/Form_builder.php b/fuel/modules/fuel/libraries/Form_builder.php
index 4a8b60bc1..cef030d82 100644
--- a/fuel/modules/fuel/libraries/Form_builder.php
+++ b/fuel/modules/fuel/libraries/Form_builder.php
@@ -76,7 +76,7 @@ class Form_builder {
 	public $tooltip_labels = TRUE; // use tooltip labels?
 	public $single_select_mode = 'auto'; // auto will use enum if 2 or less and a single select if greater than 2. Other values are enum or select 
 	public $multi_select_mode = 'auto'; // auto will use a series of checkboxes if 5 or less and a multiple select if greater than 5. Other values are multi or checkbox 
-	public $boolean_mode = 'checkbox'; // booleon mode can be checkbox or enum (which will display radio inputs)
+	public $boolean_mode = 'checkbox'; // boolean mode can be checkbox or enum (which will display radio inputs)
 	public $display_errors_func = 'display_errors'; // the function used to generate errors... usually display_errors is the name
 	public $display_errors = FALSE; // displays errors at the top of the form if TRUE
 	public $question_keys = array('how', 'do', 'when', 'what', 'why', 'where', 'how', 'is', 'which', 'did', 'any','would', 'should', 'could'); // adds question marks to the label if has these words in the label
@@ -89,7 +89,7 @@ class Form_builder {
 	public $row_id_prefix = ''; // the row id prefix
 	public $lang_prefix = 'form_label_'; // language prefix to be applied before a label
 	public $custom_fields = array(); // custom fields
-	public $auto_execute_js = TRUE; // autmoatically execute the javascript for the form
+	public $auto_execute_js = TRUE; // automatically execute the javascript for the form
 	public $html_prepend = ''; // prepended HTML to the form HINT: Can include JS script tags
 	public $html_append = ''; // appended HTML to the form HINT: Can include JS script tags
 	public $representatives = array(); // an array of fields that have arrays or regular expression values to match against different field types (e.g. 'number'=>'bigint|smallint|tinyint|int')
@@ -507,7 +507,7 @@ public function render_divs($fields = NULL)
 	{
 		if (!empty($fields)) $this->set_fields($fields);
 
-		// reoarder
+		// reorder
 		$this->set_field_order();
 		
 		// pre process field values
@@ -701,7 +701,7 @@ public function render_table($fields = NULL)
 	{
 		if (!empty($fields)) $this->set_fields($fields);
 
-		// reoarder
+		// reorder
 		$this->set_field_order();
 		
 		// pre process field values
@@ -940,7 +940,7 @@ public function render_template($template, $fields = NULL, $parse = TRUE)
 	{
 		if (!empty($fields)) $this->set_fields($fields);
 
-		// reoarder
+		// reorder
 		$this->set_field_order();
 		
 		// pre process field values
@@ -1286,7 +1286,7 @@ protected function _default($val)
 			'type' => '', // the type attribute of the field (e.g. text, select, password, etc.)
 			'default' => '', // the default value of the field
 			'max_length' => 0, // the maxlength parameter to associate with the field
-			'comment' => '', // a comment to assicate with the field's label'
+			'comment' => '', // a comment to associate with the field's label
 			'label' => '', // the label to associate with the field
 			'before_label' => '', // for HTML before the label
 			'after_label' => '', // for HTML after the label
@@ -1312,8 +1312,8 @@ protected function _default($val)
 			'ignore_representative' => FALSE, // ignores any representative
 			'data' => array(), // data attributes
 			'title' => NULL, // the title attribute
-			'attributes' => '', // a generic string value of attributes for the form field (e.g. 'class="myclass"'
-			'__DEFAULTS__' => TRUE // set so that we no that the array has been processed and we can check it so it won't process it again'
+			'attributes' => '', // a generic string value of attributes for the form field (e.g. 'class="myclass"')
+			'__DEFAULTS__' => TRUE // set so that we no that the array has been processed and we can check it so it won't process it again
 		);
 		
 		$params = array_merge($defaults, $val);
@@ -1584,7 +1584,7 @@ protected function _has_defaults($vals)
 	 * 
 	 * @access	public
 	 * @param	array fields parameters
-	 * @param	boolean shoud the normalization be ran again?
+	 * @param	boolean should the normalization be ran again?
 	 * @return	string
 	 */
 	public function create_field($params, $normalize = TRUE)
@@ -1603,7 +1603,7 @@ public function create_field($params, $normalize = TRUE)
 			{
 				$matched = FALSE;
 				
-				// if the represntative is an associative array with keys being parameters to match (e.g. type and name), then we loop through those parameters to find a match
+				// if the representative is an associative array with keys being parameters to match (e.g. type and name), then we loop through those parameters to find a match
 				if (is_array($val) AND is_string(key($val)))
 				{
 					foreach($val as $k => $v)
@@ -1685,7 +1685,7 @@ public function create_field($params, $normalize = TRUE)
 	 * 
 	 * @access	public
 	 * @param	array fields parameters
-	 * @param	boolean shoud the label be displayed?
+	 * @param	boolean should the label be displayed?
 	 * @return	string
 	 */
 	public function create_label($params, $use_label = TRUE)
@@ -2163,7 +2163,7 @@ public function create_enum($params)
 	// --------------------------------------------------------------------
 
 	/**
-	 * Creates the multi select input for the form (this is overwritten by the Fuel_custom_fields to give more functionaltity)
+	 * Creates the multi select input for the form (this is overwritten by the Fuel_custom_fields to give more functionality)
 	 *
 	 * @access	public
 	 * @param	array fields parameters
diff --git a/fuel/modules/fuel/libraries/Fuel.php b/fuel/modules/fuel/libraries/Fuel.php
index 736d2b941..69bf76473 100644
--- a/fuel/modules/fuel/libraries/Fuel.php
+++ b/fuel/modules/fuel/libraries/Fuel.php
@@ -219,7 +219,7 @@ public function install()
 		// 	"3) Enable the CMS admin by changing the 'admin_enabled' config value in fuel/application/config/MY_fuel.php.",
 		// 	"4) Change the 'fuel_mode' config value in in fuel/application/config/MY_fuel.php to allow for pages to be created in the CMS.",
 		// 	"5) Change the 'site_name' config value in the fuel/application/config/MY_fuel.php.",
-		// 	"6) Setup your evironments fuel/application/config/environments.php.",
+		// 	"6) Setup your environments fuel/application/config/environments.php.",
 		// 	"7) Will make the fuel/application/logs, fuel/application/cache and assets/images folders writable.",
 		// 	"8) Update the fuel/application/config/database.php file with the inputted values.",
 		// 	"9) Create a database and install the fuel_schema.sql file using your local MySQL connection.\n",
diff --git a/fuel/modules/fuel/libraries/Fuel_admin.php b/fuel/modules/fuel/libraries/Fuel_admin.php
index 8769fdc37..0a2878e5d 100644
--- a/fuel/modules/fuel/libraries/Fuel_admin.php
+++ b/fuel/modules/fuel/libraries/Fuel_admin.php
@@ -640,7 +640,7 @@ public function set_language($language)
 	// --------------------------------------------------------------------
 	
 	/**
-	 * Returs the logged in users display language
+	 * Returns the logged in users display language
 	 *
 	 * @access	public
 	 * @return	string
@@ -696,7 +696,7 @@ public function load_languages()
 	 * Loads the localized language files used for javascript (e.g. markItUp!)
 	 *
 	 * @access	public
-	 * @param	array 	An array of javascript languange files (optional)
+	 * @param	array 	An array of javascript language files (optional)
 	 * @param	boolean	"Private" parameter so that the file will only be loaded once (optional)
 	 * @return	array
 	 */	
@@ -1162,7 +1162,7 @@ public function set_display_mode($mode)
 	 *
 	 * @access	public
 	 * @param	string	The text to display in the titlebar
-	 * @param	string	The icon to dislpay to the left of the title bar breadcrumb (optional)
+	 * @param	string	The icon to display to the left of the title bar breadcrumb (optional)
 	 * @return	void
 	 */	
 	public function set_titlebar($title, $icon = '')
@@ -1198,7 +1198,7 @@ public function titlebar()
 	 * Sets the title bar icon
 	 *
 	 * @access	public
-	 * @param	string	The icon to dislpay to the left of the title bar breadcrumb (optional)
+	 * @param	string	The icon to display to the left of the title bar breadcrumb (optional)
 	 * @return	void
 	 */	
 	public function set_titlebar_icon($icon = '')
@@ -1238,7 +1238,7 @@ public function titlebar_icon()
 	// --------------------------------------------------------------------
 	
 	/**
-	 * Returns a nofication flash message to display
+	 * Returns a notification flash message to display
 	 *
 	 * @access	public
 	 * @param	type	The type of message to display. Options are error, success and info. (optional)
@@ -1253,7 +1253,7 @@ public function notification($type = '')
 	// --------------------------------------------------------------------
 	
 	/**
-	 * Sets the nofication flash message to display
+	 * Sets the notification flash message to display
 	 *
 	 * @access	public
 	 * @param	string	Notification message to display
diff --git a/fuel/modules/fuel/libraries/Fuel_advanced_module.php b/fuel/modules/fuel/libraries/Fuel_advanced_module.php
index 3f61c9f42..1aea4909a 100644
--- a/fuel/modules/fuel/libraries/Fuel_advanced_module.php
+++ b/fuel/modules/fuel/libraries/Fuel_advanced_module.php
@@ -68,7 +68,7 @@ public function __construct($params = array())
 	 * Accepts an associative array as input, containing object preferences.
 	 *
 	 * @access	public
-	 * @param	array	Array of initalization parameters  (optional)
+	 * @param	array	Array of initialization parameters  (optional)
 	 * @return	void
 	 */	
 	public function initialize($params = array())
@@ -326,7 +326,7 @@ public function attach($key, $obj = NULL)
 				$this->_attached[$key] =& $obj;
 			}
 			
-			// if it's an array, then we use the key as the module value if it is a string and the value is the library to laod
+			// if it's an array, then we use the key as the module value if it is a string and the value is the library to load
 			else if (is_array($obj))
 			{
 				$module = key($obj);
@@ -388,7 +388,7 @@ public function attach($key, $obj = NULL)
 				// first look for a Fuel_$key library in the module's folder'
 				if (file_exists($this->server_path('libraries/Fuel_'.$key.'.php')))
 				{
-					// this was added to prevent the loading of config files auotmatically
+					// this was added to prevent the loading of config files automatically
 					$init = array('name' => $key);
 					$this->load_library('fuel_'.$key, $init);
 					$this->_attached[$key] =& $this->CI->{'fuel_'.$key};
@@ -793,7 +793,7 @@ public function has_css()
 	// --------------------------------------------------------------------
 	
 	/**
-	 * Returns the navigaiton items for the advanced module
+	 * Returns the navigation items for the advanced module
 	 *
 	 * @access	public
 	 * @return	mixed (returns an array of navigation menu items or FALSE if none)
@@ -840,7 +840,7 @@ public function docs_path()
 	// --------------------------------------------------------------------
 	
 	/**
-	 * Returns whether documenation exists for the advanced module
+	 * Returns whether documentation exists for the advanced module
 	 *
 	 * @access	public
 	 * @return	boolean
@@ -967,7 +967,7 @@ protected function _tmp_set_cache_path()
 	// --------------------------------------------------------------------
 	
 	/**
-	 * Returns whether documenation exists for the advanced module
+	 * Returns whether documentation exists for the advanced module
 	 *
 	 * @access	public
 	 * @return	boolean
@@ -979,7 +979,7 @@ public function has_cache()
 	// --------------------------------------------------------------------
 	
 	/**
-	 * Returns whether documenation exists for the advanced module
+	 * Returns whether documentation exists for the advanced module
 	 *
 	 * @access	public
 	 * @return	boolean
diff --git a/fuel/modules/fuel/libraries/Fuel_assets.php b/fuel/modules/fuel/libraries/Fuel_assets.php
index 3250d623f..fc637e454 100644
--- a/fuel/modules/fuel/libraries/Fuel_assets.php
+++ b/fuel/modules/fuel/libraries/Fuel_assets.php
@@ -67,7 +67,7 @@ public function __construct($params = array())
 	 * Also will set the values in the parameters array as properties of this object
 	 *
 	 * @access	public
-	 * @param	array	Array of initalization parameters  (optional)
+	 * @param	array	Array of initialization parameters  (optional)
 	 * @return	void
 	 */	
 	public function initialize($params = array())
@@ -730,7 +730,7 @@ public function zip($dir, $file_name = NULL, $download = FALSE, $allow_overwrite
 		if (is_string($dir))
 		{
 			// if string is a directory path, then we read the directory... 
-			// may be too presumptious but it's convenient'
+			// may be too presumptuous but it's convenient
 			if (is_dir($dir))
 			{
 				$this->CI->zip->read_dir($dir);
diff --git a/fuel/modules/fuel/libraries/Fuel_cache.php b/fuel/modules/fuel/libraries/Fuel_cache.php
index 988b7b5ef..c6569f78a 100644
--- a/fuel/modules/fuel/libraries/Fuel_cache.php
+++ b/fuel/modules/fuel/libraries/Fuel_cache.php
@@ -70,7 +70,7 @@ public function __construct($params = array())
 	 * Accepts an associative array as input, containing object preferences.
 	 *
 	 * @access	public
-	 * @param	array	Array of initalization parameters  (optional)
+	 * @param	array	Array of initialization parameters  (optional)
 	 * @return	void
 	 */	
 	public function initialize($params = array())
diff --git a/fuel/modules/fuel/libraries/Fuel_installer.php b/fuel/modules/fuel/libraries/Fuel_installer.php
index 8caa29c3f..cd8ae4611 100644
--- a/fuel/modules/fuel/libraries/Fuel_installer.php
+++ b/fuel/modules/fuel/libraries/Fuel_installer.php
@@ -63,7 +63,7 @@ public function __construct($params = array())
 	 * Accepts an associative array as input, containing object preferences.
 	 *
 	 * @access	public
-	 * @param	array	Array of initalization parameters  (optional)
+	 * @param	array	Array of initialization parameters  (optional)
 	 * @return	void
 	 */	
 	public function initialize($params = array())
@@ -530,7 +530,7 @@ protected function _save_allowed_settings($module, $allowed)
 	// --------------------------------------------------------------------
 	
 	/**
-	 * Checks that the module is comptable with the installed version of FUEL
+	 * Checks that the module is compatible with the installed version of FUEL
 	 *
 	 * @access	public
 	 * @return	boolean
@@ -542,7 +542,7 @@ public function is_compatible()
 			$compatibility = $this->config['compatibility'];
 			$fuel_version = $this->fuel->version();
 
-			// if the current version of FUEL is greater then or equal to the compatability version, the we are good to go
+			// if the current version of FUEL is greater then or equal to the compatibility version, the we are good to go
 			if (version_compare($compatibility, $fuel_version, '>='))
 			{
 				return FALSE;
diff --git a/fuel/modules/fuel/libraries/Fuel_language.php b/fuel/modules/fuel/libraries/Fuel_language.php
index a813ab3b5..0bf032ffa 100644
--- a/fuel/modules/fuel/libraries/Fuel_language.php
+++ b/fuel/modules/fuel/libraries/Fuel_language.php
@@ -70,7 +70,7 @@ public function __construct($params = array())
 	 * Accepts an associative array as input, containing object preferences.
 	 *
 	 * @access	public
-	 * @param	array	Array of initalization parameters  (optional)
+	 * @param	array	Array of initialization parameters  (optional)
 	 * @return	void
 	 */	
 	public function initialize($params = array())
@@ -700,7 +700,7 @@ function uri($uri = '', $lang = NULL)
 			static $lang_seg;
 			static $no_lang;
 	
-			// set static $detct_lang to speed up subsequent calls
+			// set static $detect_lang to speed up subsequent calls
 			if ($use_detect_lang)
 			{
 				if (is_null($detect_lang))
diff --git a/fuel/modules/fuel/libraries/Fuel_layouts.php b/fuel/modules/fuel/libraries/Fuel_layouts.php
index 5c71fada0..94f692e27 100644
--- a/fuel/modules/fuel/libraries/Fuel_layouts.php
+++ b/fuel/modules/fuel/libraries/Fuel_layouts.php
@@ -78,7 +78,7 @@ public function __construct($params = array())
 	 */	
 	public function initialize($config = array())
 	{
-		// setup any intialized variables
+		// setup any initialized variables
 		foreach ($config as $key => $val)
 		{
 			if (isset($this->$key))
@@ -499,7 +499,7 @@ public function initialize($params = array())
 			$params = array('name' => $params);
 		}
 
-		// setup any intialized variables
+		// setup any initialized variables
 		foreach ($params as $key => $val)
 		{
 			if (isset($this->$key) AND isset($val))
diff --git a/fuel/modules/fuel/libraries/Fuel_logs.php b/fuel/modules/fuel/libraries/Fuel_logs.php
index 768a4924e..976cbd10e 100644
--- a/fuel/modules/fuel/libraries/Fuel_logs.php
+++ b/fuel/modules/fuel/libraries/Fuel_logs.php
@@ -57,7 +57,7 @@ public function __construct($params = array())
 	 * Accepts an associative array as input, containing object preferences.
 	 *
 	 * @access	public
-	 * @param	array	Array of initalization parameters  (optional)
+	 * @param	array	Array of initialization parameters  (optional)
 	 * @return	void
 	 */	
 	public function initialize($params = array())
diff --git a/fuel/modules/fuel/libraries/Fuel_modules.php b/fuel/modules/fuel/libraries/Fuel_modules.php
index da28214cb..8414819c6 100644
--- a/fuel/modules/fuel/libraries/Fuel_modules.php
+++ b/fuel/modules/fuel/libraries/Fuel_modules.php
@@ -64,7 +64,7 @@ public function __construct($params = array())
 	 * Accepts an associative array as input, containing module initialization preferences.
 	 *
 	 * @access	public
-	 * @param	array	Array of additional module initialiation parameters  (optional)
+	 * @param	array	Array of additional module initialization parameters  (optional)
 	 * @return	void
 	 */	
 	public function initialize($params = array(), $add = TRUE)
@@ -231,7 +231,7 @@ public function add($mod, $init)
 	 *
 	 * @access	public
 	 * @param	string	Module name (optional)
-	 * @param	boolean	Whether to include advanced modules in the search. Defeault is TRUE. (optional)
+	 * @param	boolean	Whether to include advanced modules in the search. Default is TRUE. (optional)
 	 * @return	object	Fuel_module object
 	 */	
 	public function get($module = NULL, $include_advanced = TRUE)
@@ -583,7 +583,7 @@ public function __construct($params = array())
 	 */	
 	public function initialize($params = array(), $init = array())
 	{
-		// setup any intialized variables
+		// setup any initialized variables
 		if (is_array($params))
 		{
 			if (!empty($params['module']))
@@ -899,7 +899,7 @@ public function pages()
 	 * Returns the url based on the preview_path configuration of the simple module
 	 *
 	 * @access	public
-	 * @param	array	data to be merged in with perview path URL
+	 * @param	array	data to be merged in with preview path URL
 	 * @return	string
 	 */	
 	public function url($data = array())
@@ -1033,7 +1033,7 @@ public function find($params = array(), $where = NULL)
 			}
 		}
 
-		 // to get around escapinng issues we need to add spaces after =
+		 // to get around escaping issues we need to add spaces after =
 		if (is_string($where))
 		{
 			$where = preg_replace('#([^>|<|!])=#', '$1 = ', $where);
@@ -1085,7 +1085,7 @@ public function find($params = array(), $where = NULL)
 	 * An alias to the modules model to save
 	 *
 	 * @access	public
-	 * @param	arrray	An array of values to save to the module's model
+	 * @param	array	An array of values to save to the module's model
 	 * @return	boolean
 	 */
 	public function save($values)
@@ -1099,7 +1099,7 @@ public function save($values)
 	 * An alias to the module's model t create a new record
 	 *
 	 * @access	public
-	 * @param	arrray	An array of values to save to the module's model (optional)
+	 * @param	array	An array of values to save to the module's model (optional)
 	 * @return	object	Record_class object
 	 */
 	public function create($values = array())
diff --git a/fuel/modules/fuel/libraries/Fuel_navigation.php b/fuel/modules/fuel/libraries/Fuel_navigation.php
index 3f62da0bb..32d325e0e 100644
--- a/fuel/modules/fuel/libraries/Fuel_navigation.php
+++ b/fuel/modules/fuel/libraries/Fuel_navigation.php
@@ -176,7 +176,7 @@ public function render($params = array())
 			{
 				if ($this->CI->fuel->navigation->mode() != 'cms')
 				{
-					// load in navigation file as a starting poing
+					// load in navigation file as a starting point
 					if (file_exists(APPPATH.'views/_variables/'.$p['file'].'.php'))
 					{
 						$p['root_value'] = NULL;
diff --git a/fuel/modules/fuel/libraries/Fuel_pages.php b/fuel/modules/fuel/libraries/Fuel_pages.php
index 624ea1847..102a67374 100644
--- a/fuel/modules/fuel/libraries/Fuel_pages.php
+++ b/fuel/modules/fuel/libraries/Fuel_pages.php
@@ -81,7 +81,7 @@ public function create($init = array(), $set_active = TRUE)
 	 */	
 	public function set_active(&$page)
 	{
-		// for backwards compatability
+		// for backwards compatibility
 		$this->CI->fuel_page = $page;
 		$this->CI->fuel->attach('page', $page);
 		$this->_active = $page;
@@ -94,7 +94,7 @@ public function set_active(&$page)
 	 *
 	 * @access	public
 	 * @param	string	The page to set as active
-	 * @param	array	An array of initializtion parameters
+	 * @param	array	An array of initialization parameters
 	 * @return	object
 	 */	
 	public function get($location, $init = array())
@@ -211,7 +211,7 @@ public function cms()
 	// --------------------------------------------------------------------
 	
 	/**
-	 * Returns an array of pages created by a module. The module must have a prevew path
+	 * Returns an array of pages created by a module. The module must have a preview path
 	 *
 	 * @access	public
 	 * @return	array
@@ -545,7 +545,7 @@ public function initialize($params = array())
 			$params = array('location' => $params);
 		}
 		
-		// setup any intialized variables
+		// setup any initialized variables
 		foreach ($params as $key => $val)
 		{
 			if (isset($this->$key))
@@ -1262,7 +1262,7 @@ public function get_marker_regex()
 	// --------------------------------------------------------------------
 	
 	/**
-	 * Renders a marker on the page which is used on the front end to create the inline editng pencil icons with some javascript
+	 * Renders a marker on the page which is used on the front end to create the inline editing pencil icons with some javascript
 	 *
 	 * @access	public
 	 * @param	string	The markers key value used to identify it on the apge
diff --git a/fuel/modules/fuel/libraries/Fuel_parser.php b/fuel/modules/fuel/libraries/Fuel_parser.php
index 9b5f87294..cb95ef6e4 100644
--- a/fuel/modules/fuel/libraries/Fuel_parser.php
+++ b/fuel/modules/fuel/libraries/Fuel_parser.php
@@ -288,7 +288,7 @@ public function remove_allowed_function($func)
 	 *
 	 * @access	public
 	 * @param	mixed 	Can be an array or a string (but if string must pass the second $value parameter)
-	 * @param	mised 	A value to associate with the $data (which is the $variable name... optional)
+	 * @param	mixed 	A value to associate with the $data (which is the $variable name... optional)
 	 * @return	object 	A reference to the Fuel_parser object
 	 */
 	public function add_data($data, $value = NULL)
diff --git a/fuel/modules/fuel/libraries/Fuel_permissions.php b/fuel/modules/fuel/libraries/Fuel_permissions.php
index 066128a95..d20f5f0b7 100644
--- a/fuel/modules/fuel/libraries/Fuel_permissions.php
+++ b/fuel/modules/fuel/libraries/Fuel_permissions.php
@@ -60,14 +60,14 @@ public function __construct($params = array())
 	 * Accepts an associative array as input, containing object preferences.
 	 *
 	 * @access	public
-	 * @param	array	Array of initalization parameters  (optional)
+	 * @param	array	Array of initialization parameters  (optional)
 	 * @return	void
 	 */	
 	public function initialize($params = array(), $add = TRUE)
 	{
 		parent::initialize($params);
 		
-		// can't use because contstructor hasn't initialized
+		// can't use because constructor hasn't initialized
 		$this->_perms = $this->model()->find_all_array_assoc('name');
 	}
 
diff --git a/fuel/modules/fuel/libraries/Fuel_posts.php b/fuel/modules/fuel/libraries/Fuel_posts.php
index 7275b5856..3dc02bd90 100644
--- a/fuel/modules/fuel/libraries/Fuel_posts.php
+++ b/fuel/modules/fuel/libraries/Fuel_posts.php
@@ -298,7 +298,7 @@ protected function _clean_segment($seg)
 	// --------------------------------------------------------------------
 
 	/**
-	 * Normalizes the route by removing placedholers (e.g. :any and ($name:....)).
+	 * Normalizes the route by removing placeholders (e.g. :any and ($name:....)).
 	 *
 	 * @access	protected
 	 * @param	string 	The route to normalize
diff --git a/fuel/modules/fuel/libraries/Fuel_redirects.php b/fuel/modules/fuel/libraries/Fuel_redirects.php
index 88a0c006b..5acb85f23 100644
--- a/fuel/modules/fuel/libraries/Fuel_redirects.php
+++ b/fuel/modules/fuel/libraries/Fuel_redirects.php
@@ -63,7 +63,7 @@ public function __construct($params = array())
 	 * Accepts an associative array as input, containing object preferences.
 	 *
 	 * @access	public
-	 * @param	array	Array of initalization parameters  (optional)
+	 * @param	array	Array of initialization parameters  (optional)
 	 * @return	void
 	 */	
 	public function initialize($params = array())
diff --git a/fuel/modules/fuel/libraries/Fuel_users.php b/fuel/modules/fuel/libraries/Fuel_users.php
index 7a575b72b..61392e76c 100644
--- a/fuel/modules/fuel/libraries/Fuel_users.php
+++ b/fuel/modules/fuel/libraries/Fuel_users.php
@@ -208,7 +208,7 @@ public function get_password_strength_text()
 
 			if (in_array('symbols', $rules_array))
 			{
-				$str_arr[] = lang('pwd_symbols_required').' (e.g. +_!@#$\%^&*.,?-)'; // broken out to preven sprintf error
+				$str_arr[] = lang('pwd_symbols_required').' (e.g. +_!@#$\%^&*.,?-)'; // broken out to prevent sprintf error
 			}
 		}
 
diff --git a/fuel/modules/fuel/libraries/Inspection.php b/fuel/modules/fuel/libraries/Inspection.php
index e4a7478c8..c9d08226e 100644
--- a/fuel/modules/fuel/libraries/Inspection.php
+++ b/fuel/modules/fuel/libraries/Inspection.php
@@ -21,7 +21,7 @@
  *
  * This class can be used to inspect other files and will return objects that can be 
  * further used to generate for example, this page and many of the other pages found in this User Guide.
- * It is essentially a wrapper around many of the convenient objects and methods of the <a href="http://php.net/manual/en/class.reflectionclass.php" target="_blank">PHP Refelction class</a>
+ * It is essentially a wrapper around many of the convenient objects and methods of the <a href="http://php.net/manual/en/class.reflectionclass.php" target="_blank">PHP Reflection class</a>
  * but provides extra functionality for parsing out comment information. Below is a list of related classes used by the Inspection class:
  <ul>
  	<li><a href="#inspection_class">Inspection_class</a></li>
@@ -527,7 +527,7 @@ public function method($method)
 	 * @access	public
 	 * @param	array	The type of properties to include. Options are 'public', 'protected', and 'private. Default will only show public'(optional)
 	 * @param	boolean	Determines whether to include any parent properties. Default is FALSE (optional)
-	 * @param	boolean	Determines whether to include the contstructor method. Default is FALSE (optional)
+	 * @param	boolean	Determines whether to include the constructor method. Default is FALSE (optional)
 	 * @return	array
 	 */	
 	public function methods($types = array(), $include_parent = FALSE, $include_constructor = FALSE)
@@ -563,7 +563,7 @@ public function methods($types = array(), $include_parent = FALSE, $include_cons
 		$methods = array();
 		foreach($this->_methods as $name => $m)
 		{
-			// filter out contstructors
+			// filter out constructors
 			if (!$include_constructor AND ($name == '__construct' OR $name == $this->name))
 			{
 				continue;
@@ -1207,7 +1207,7 @@ public function set_text($text)
 	 * Adds a filter to be used for processing comments (e.g. the [ user_guide_url ] is rendered using a filter)
 	 *
 	 * @access	public
-	 * @param	string	The name of the function or a lamda
+	 * @param	string	The name of the function or a lambda
 	 * @param	string	A key value to assign to the filter which can be used in removing filters later
 	 * @return	boolean
 	 */	
diff --git a/fuel/modules/fuel/libraries/MY_Typography.php b/fuel/modules/fuel/libraries/MY_Typography.php
index c9ff23c23..66d82b6e0 100644
--- a/fuel/modules/fuel/libraries/MY_Typography.php
+++ b/fuel/modules/fuel/libraries/MY_Typography.php
@@ -163,7 +163,7 @@ public function auto_typography($str, $reduce_linebreaks = FALSE)
 			$str = preg_replace("/^(.*?)<(".$this->block_elements.")/i", '<p>$1</p><$2', $str);
 		}
 
-		// Convert quotes, elipsis, em-dashes, non-breaking spaces, and ampersands
+		// Convert quotes, ellipsis, em-dashes, non-breaking spaces, and ampersands
 		$str = $this->format_characters($str);
 
 		// restore HTML comments
@@ -189,7 +189,7 @@ public function auto_typography($str, $reduce_linebreaks = FALSE)
 						// Clean up stray paragraph tags that appear before block level elements
 						'#<p></p><('.$this->block_elements.')#'	=> '<$1',
 
-						// Clean up stray non-breaking spaces preceeding block elements
+						// Clean up stray non-breaking spaces preceding block elements
 						'#(&nbsp;\s*)+<('.$this->block_elements.'|'.$this->sometimes_block_elements.')#i'	=> '  <$2',
 
 						// Replace the temporary markers we added earlier
diff --git a/fuel/modules/fuel/libraries/Menu.php b/fuel/modules/fuel/libraries/Menu.php
index e656788ac..a22816ae5 100644
--- a/fuel/modules/fuel/libraries/Menu.php
+++ b/fuel/modules/fuel/libraries/Menu.php
@@ -174,7 +174,7 @@ public function reset()
 	 *
 	 * @access	protected
 	 * @param	array menu item data
-	 * @param	boolean wether or not to use the nav_key field instead of the array key for the unique ID
+	 * @param	boolean whether or not to use the nav_key field instead of the array key for the unique ID
 	 * @return	array
 	 */
 	public function normalize_items($items)
@@ -429,7 +429,7 @@ protected function _render_basic($menu, $level = -1)
 		$str = '';
 		if (!empty($menu) AND (isset($this->depth) AND $level < $this->depth) OR !isset($this->depth))
 		{
-			// filter out hidden ones first. Need to do in seperate loop in case there is a hidden one at the end
+			// filter out hidden ones first. Need to do in separate loop in case there is a hidden one at the end
 			$menu = $this->_filter_hidden($menu);
 
 			if (!empty($menu))
@@ -485,7 +485,7 @@ protected function _render_basic($menu, $level = -1)
 	 */
 	protected function _render_collabsible($menu, $level = 0)
 	{
-		// filter out hidden ones first. Need to do in seperate loop in case there is a hidden one at the end
+		// filter out hidden ones first. Need to do in separate loop in case there is a hidden one at the end
 		$menu = $this->_filter_hidden($menu);
 		
 		$str = '';
@@ -736,7 +736,7 @@ protected function _render_page_title($menu)
 	 */
 	protected function _render_delimited($menu)
 	{
-		// filter out hidden ones first. Need to do in seperate loop in case there is a hidden one at the end
+		// filter out hidden ones first. Need to do in separate loop in case there is a hidden one at the end
 		$menu = $this->_filter_hidden($menu);
 		
 		if ($this->container_tag !== FALSE)
diff --git a/fuel/modules/fuel/libraries/Unzip.php b/fuel/modules/fuel/libraries/Unzip.php
index 9f3a25f9e..be6bf898b 100755
--- a/fuel/modules/fuel/libraries/Unzip.php
+++ b/fuel/modules/fuel/libraries/Unzip.php
@@ -67,7 +67,7 @@ function __construct()
 	// --------------------------------------------------------------------
 
 	/**
-	 * re inizilize all variables
+	 * re initialize all variables
 	 * @access	Private
 	 * @param		none
 	 * @return	none
@@ -133,7 +133,7 @@ public function extract($zip_file, $target_dir = NULL, $preserve_filepath = TRUE
 
 						if ( ! @mkdir($this->_target_dir . '/' . $str))
 						{
-							$this->set_error('Desitnation path is not writable.');
+							$this->set_error('Destination path is not writable.');
 							return FALSE;
 						}
 
diff --git a/fuel/modules/fuel/libraries/Validator.php b/fuel/modules/fuel/libraries/Validator.php
index a2113ff40..c4c3a3f9a 100644
--- a/fuel/modules/fuel/libraries/Validator.php
+++ b/fuel/modules/fuel/libraries/Validator.php
@@ -125,7 +125,7 @@ public function add_rule($field, $func, $msg, $params = array())
 		if (empty($fields[$field])) $fields[$field] = array();
 		settype($params, 'array');
 		
-		// if params are emtpy then we will look in the $_POST
+		// if params are empty then we will look in the $_POST
 		if (empty($params))
 		{
 			if (!empty($_POST[$field])) $params = $_POST[$field];
diff --git a/fuel/modules/fuel/models/Base_module_model.php b/fuel/modules/fuel/models/Base_module_model.php
index 23c1d1d89..d50cbaec2 100644
--- a/fuel/modules/fuel/models/Base_module_model.php
+++ b/fuel/modules/fuel/models/Base_module_model.php
@@ -637,7 +637,7 @@ public function friendly_filter_info($values)
 	 *
 	 * @access	protected
 	 * @param	string The name of the model's property to use to generate the tree. Options are 'foreign_keys', 'has_many' or 'belongs_to'
-	 * @return	array An array that can be used by the Menu class to create a hierachical structure
+	 * @return	array An array that can be used by the Menu class to create a hierarchical structure
 	 */	
 	protected function _tree($prop = NULL)
 	{
@@ -1080,7 +1080,7 @@ public function related_items($params = array())
 	 * @access	public
 	 * @param	string	the column to use for the value (optional)
 	 * @param	string	the column to use for the label (optional)
-	 * @param	mixed	an array or string containg the where paramters of a query (optional)
+	 * @param	mixed	an array or string containing the where parameters of a query (optional)
 	 * @param	mixed	the order by of the query. Defaults to TRUE which means it will sort by $val asc (optional)
 	 * @return	array
 	 */	
@@ -1323,7 +1323,7 @@ public function get_embedded_list_items($params, $list_cols = array(), $actions
 	 * The ajax method to be called for the embedded list view
 	 *
 	 * @access	public
-	 * @param  	array  GET and POST arams that will be used for filtering
+	 * @param  	array  GET and POST params that will be used for filtering
 	 * @return	string The HTML to display
 	 */	
 	public function ajax_embedded_list_items($params)
@@ -1616,7 +1616,7 @@ class Base_module_record extends Data_record {
 	protected $_fuel = NULL;
 	
 	/**
-	 * Constructor - overwritten to add _fuel object for reference for convinience
+	 * Constructor - overwritten to add _fuel object for reference for convenience
 	 * @param	object	parent object
 	 */
 	public function __construct(&$parent = NULL)
diff --git a/fuel/modules/fuel/models/Base_posts_model.php b/fuel/modules/fuel/models/Base_posts_model.php
index b133d4458..31a6600bf 100644
--- a/fuel/modules/fuel/models/Base_posts_model.php
+++ b/fuel/modules/fuel/models/Base_posts_model.php
@@ -8,7 +8,7 @@ abstract class Base_posts_model extends Base_module_model {
 	public $filters = array('title', 'content'); // filters to apply to when searching for items
 	public $required = array('title', 'content'); // an array of required fields. If a key => val is provided, the key is name of the field and the value is the error message to display
 	public $foreign_keys = array('category_id' => array(FUEL_FOLDER => 'fuel_categories_model')); // map foreign keys to table models
-	public $linked_fields = array(); // fields that are linked meaning one value helps to determine another. Key is the field, value is a function name to transform it. (e.g. array('slug' => 'title'), or array('slug' => arry('name' => 'strtolower')));
+	public $linked_fields = array(); // fields that are linked meaning one value helps to determine another. Key is the field, value is a function name to transform it. (e.g. array('slug' => 'title'), or array('slug' => array('name' => 'strtolower')));
 	public $boolean_fields = array('featured'); // fields that are tinyint and should be treated as boolean
 	public $unique_fields = array('slug'); // fields that are not IDs but are unique. Can also be an array of arrays for compound keys
 	public $parsed_fields = array('content', 'content_formatted', 'excerpt', 'excerpt_formatted'); // fields to automatically parse
@@ -246,7 +246,7 @@ public function get_excerpt($char_limit = NULL, $end_char = '&#8230;')
 
 		if (!empty($char_limit))
 		{
-			// must strip tags to get accruate character count
+			// must strip tags to get accurate character count
 			$excerpt = strip_tags($excerpt);
 			$excerpt = character_limiter($excerpt, $char_limit, $end_char);
 		}
diff --git a/fuel/modules/fuel/models/Fuel_assets_model.php b/fuel/modules/fuel/models/Fuel_assets_model.php
index bfde2e5f2..fd44bc419 100644
--- a/fuel/modules/fuel/models/Fuel_assets_model.php
+++ b/fuel/modules/fuel/models/Fuel_assets_model.php
@@ -18,7 +18,7 @@
 /**
  * Extends CI_Model
  *
- * <strong>Fuel_assets_model</strong> is used for managing asset data with the file system which includes retrieving and deleting images, pdfs, etc.
+ * <strong>Fuel_assets_model</strong> is used for managing asset data with the file system which includes retrieving and deleting images, PDFs, etc.
  * 
  * @package		FUEL CMS
  * @subpackage	Models
@@ -488,7 +488,7 @@ public function filters($values = array())
 	}
 
 	/**
-	 * Displays the most recently uplloaded 
+	 * Displays the most recently uploaded
 	 *
 	 * @access	public
 	 * @param	array View variable data (optional)
diff --git a/fuel/modules/fuel/models/Fuel_categories_model.php b/fuel/modules/fuel/models/Fuel_categories_model.php
index 4ea409aef..d7dd8587f 100644
--- a/fuel/modules/fuel/models/Fuel_categories_model.php
+++ b/fuel/modules/fuel/models/Fuel_categories_model.php
@@ -112,7 +112,7 @@ public function context_options_list()
 	 *
 	 * @access	public
 	 * @param	boolean Determines whether to return just published pages or not (optional... and ignored in the admin)
-	 * @return	array An array that can be used by the Menu class to create a hierachical structure
+	 * @return	array An array that can be used by the Menu class to create a hierarchical structure
 	 */	
 	public function tree($just_published = FALSE)
 	{
@@ -267,7 +267,7 @@ public function get_children($where = array(), $order = NULL, $limit = NULL, $of
 	// --------------------------------------------------------------------
 	
 	/**
-	 * Magic method that will allow you to return the model object by doing something like $cateogry->get_products(TRUE);
+	 * Magic method that will allow you to return the model object by doing something like $category->get_products(TRUE);
 	 *
 	 * @access	public
 	 * @param	string	field name
diff --git a/fuel/modules/fuel/models/Fuel_navigation_model.php b/fuel/modules/fuel/models/Fuel_navigation_model.php
index 7416584da..f690f8779 100644
--- a/fuel/modules/fuel/models/Fuel_navigation_model.php
+++ b/fuel/modules/fuel/models/Fuel_navigation_model.php
@@ -161,7 +161,7 @@ protected function _find_by_array($where, $group_id = 1, $lang = NULL)
 	 *
 	 * @access	public
 	 * @param	boolean Determines whether to return just published navigation items or not (optional... and ignored in the admin)
-	 * @return	array An array that can be used by the Menu class to create a hierachical structure
+	 * @return	array An array that can be used by the Menu class to create a hierarchical structure
 	 */	
 	public function tree($just_published = FALSE)
 	{
@@ -539,14 +539,14 @@ public function _common_query($params = NULL)
 	// --------------------------------------------------------------------
 	
 	/**
-	 * Overwritten: Allows for grouping of menu items with last paramter
+	 * Overwritten: Allows for grouping of menu items with last parameter
 	 *
 	 * @access	public
 	 * @param	string	The column to use for the value (optional)
 	 * @param	string	The column to use for the label (optional)
-	 * @param	mixed	An array or string containg the where paramters of a query (optional)
+	 * @param	mixed	An array or string containing the where parameters of a query (optional)
 	 * @param	string	The order by of the query. defaults to $val asc (optional)
-	 * @param	boolean	Determines whether it will group the options together based on the menu troup (optional)
+	 * @param	boolean	Determines whether it will group the options together based on the menu group (optional)
 	 * @return	array	 */	
 	public function options_list($key = 'id', $val = 'label', $where = array(), $order = TRUE, $group = TRUE)
 	{
@@ -577,7 +577,7 @@ public function options_list($key = 'id', $val = 'label', $where = array(), $ord
 	// --------------------------------------------------------------------
 	
 	/**
-	 * Overwritten: Allows for grouping of menu items with last paramter
+	 * Overwritten: Allows for grouping of menu items with last parameter
 	 *
 	 * @access	public
 	 * @param	string The field name used as the label
diff --git a/fuel/modules/fuel/models/Fuel_pages_model.php b/fuel/modules/fuel/models/Fuel_pages_model.php
index 910d0507a..89ed38fa9 100644
--- a/fuel/modules/fuel/models/Fuel_pages_model.php
+++ b/fuel/modules/fuel/models/Fuel_pages_model.php
@@ -124,7 +124,7 @@ public function related_items($values = array())
 	 *
 	 * @access	public
 	 * @param	boolean Determines whether to return just published pages or not (optional... and ignored in the admin)
-	 * @return	array An array that can be used by the Menu class to create a hierachical structure
+	 * @return	array An array that can be used by the Menu class to create a hierarchical structure
 	 */	
 	public function tree($just_published = FALSE)
 	{
@@ -240,7 +240,7 @@ public function find_by_location($location, $just_published = 'yes')
 	// --------------------------------------------------------------------
 	
 	/**
-	 * Returns all the children pages basd on the location URI
+	 * Returns all the children pages based on the location URI
 	 *
 	 * @access	public
 	 * @param  string URI path to start from (e.g. about would find about/history, about/contact, etc)
diff --git a/fuel/modules/fuel/models/Fuel_tags_model.php b/fuel/modules/fuel/models/Fuel_tags_model.php
index 820effecc..8b9d5665a 100644
--- a/fuel/modules/fuel/models/Fuel_tags_model.php
+++ b/fuel/modules/fuel/models/Fuel_tags_model.php
@@ -167,7 +167,7 @@ public function init_relationships()
 	 *
 	 * @access	public
 	 * @param	boolean 	Determines whether to return just published pages or not (optional... and ignored in the admin)
-	 * @return	array 		An array that can be used by the Menu class to create a hierachical structure
+	 * @return	array 		An array that can be used by the Menu class to create a hierarchical structure
 	 */	
 	public function tree($just_published = FALSE)
 	{
diff --git a/fuel/modules/fuel/models/Fuel_users_model.php b/fuel/modules/fuel/models/Fuel_users_model.php
index a3e3a4fde..f76679188 100644
--- a/fuel/modules/fuel/models/Fuel_users_model.php
+++ b/fuel/modules/fuel/models/Fuel_users_model.php
@@ -136,7 +136,7 @@ public function user_info($user_id)
 		$user = $this->find_one(array('id' => $user_id));
 		$user_data = $user->values();
 		
-		// load user permisisons
+		// load user permissions
 		$user_data['permissions'] = $user->permissions;
 		return $user_data;
 	}
@@ -315,7 +315,7 @@ public function salted_password_hash($password, $salt)
 	 *
 	 * @access	public
 	 * @param	string The key value for the options list (optional)
-	 * @param	string The value (lable) value for the options list (optional)
+	 * @param	string The value (label) value for the options list (optional)
 	 * @param	string A where condition to apply to options list data
 	 * @param	string The order to return the options list data
 	 * @return	array 
@@ -875,7 +875,7 @@ public function is_new_email($email)
 	// --------------------------------------------------------------------
 	
 	/**
-	 * Validation callback to check if an existing user's email address doen't already exist in the system
+	 * Validation callback to check if an existing user's email address doesn't already exist in the system
 	 *
 	 * @access	public
 	 * @param	string The email address
diff --git a/fuel/modules/fuel/tests/Asset_test.php b/fuel/modules/fuel/tests/Asset_test.php
index 8e2ff8daa..215177ff0 100755
--- a/fuel/modules/fuel/tests/Asset_test.php
+++ b/fuel/modules/fuel/tests/Asset_test.php
@@ -38,12 +38,12 @@ public function test_paths()
 			
 			$p = $expected = WEB_PATH.$this->init['assets_path'].$this->init['assets_folders'][$type].$t['file'];
 
-			// test 1 WITHOUT timestampe cache breaker
+			// test 1 WITHOUT timestamp cache breaker
 			$test = $this->CI->asset->{$t['func']}($t['file']);
 			$expected = $p;
 			$this->run($test, $expected, 'Asset '.$t['func'].'() test 1');
 
-			// test 2 WITH timestampe cache breaker
+			// test 2 WITH timestamp cache breaker
 			$config = array('asset_append_cache_timestamp' => array($type));
 			$this->_reset($config);
 			$test = $this->CI->asset->{$t['func']}($t['file']);
diff --git a/fuel/modules/fuel/tests/My_model_test.php b/fuel/modules/fuel/tests/My_model_test.php
index 9b3b75144..86f63b96b 100755
--- a/fuel/modules/fuel/tests/My_model_test.php
+++ b/fuel/modules/fuel/tests/My_model_test.php
@@ -51,7 +51,7 @@ public function test_formatters()
 		$test_custom_records_model->add_formatter('datetime', array('date_formatter', 'm-Y'), 'formatted');
 		$test = $user->date_added_formatted;
 		$expected = '01-2012';
-		$this->run($test, $expected, 'formatter test of date formatting with configuration argments set #3');
+		$this->run($test, $expected, 'formatter test of date formatting with configuration arguments set #3');
 
 		$test_custom_records_model->remove_formatter('datetime', 'formatted');
 		$test_custom_records_model->add_formatter('datetime', 'date_formatter', 'formatted');
diff --git a/fuel/modules/fuel/tests/sql/test_fuel_schema.sql b/fuel/modules/fuel/tests/sql/test_fuel_schema.sql
index 6724f68b9..6d312e3c1 100755
--- a/fuel/modules/fuel/tests/sql/test_fuel_schema.sql
+++ b/fuel/modules/fuel/tests/sql/test_fuel_schema.sql
@@ -73,7 +73,7 @@ CREATE TABLE `fuel_logs` (
 
 CREATE TABLE `fuel_navigation` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `location` varchar(255) COLLATE utf8_unicode_ci NOT NULL COMMENT 'The part of the path after the domain name that you want the link to go to (e.g. comany/about_us)',
+  `location` varchar(255) COLLATE utf8_unicode_ci NOT NULL COMMENT 'The part of the path after the domain name that you want the link to go to (e.g. company/about_us)',
   `group_id` int(5) unsigned NOT NULL DEFAULT '1',
   `nav_key` varchar(255) COLLATE utf8_unicode_ci NOT NULL COMMENT 'The nav key is a friendly ID that you can use for setting the selected state. If left blank, a default value will be set for you.',
   `label` varchar(255) COLLATE utf8_unicode_ci NOT NULL COMMENT 'The name you want to appear in the menu',
@@ -133,7 +133,7 @@ CREATE TABLE `fuel_pages` (
   `location` varchar(255) COLLATE utf8_unicode_ci NOT NULL COMMENT 'Add the part of the url after the root of your site (usually after the domain name). For the homepage, just put the word ''home''',
   `layout` varchar(50) COLLATE utf8_unicode_ci NOT NULL COMMENT 'The name of the template to associate with this page',
   `published` enum('yes','no') COLLATE utf8_unicode_ci NOT NULL DEFAULT 'yes' COMMENT 'A ''yes'' value will display the page and an ''no'' value will give a 404 error message',
-  `cache` enum('yes','no') COLLATE utf8_unicode_ci NOT NULL DEFAULT 'yes' COMMENT 'Cache controls whether the page will pull from the database or from a saved file which is more effeicent. If a page has content that is dynamic, it''s best to set cache to ''no''',
+  `cache` enum('yes','no') COLLATE utf8_unicode_ci NOT NULL DEFAULT 'yes' COMMENT 'Cache controls whether the page will pull from the database or from a saved file which is more efficient. If a page has content that is dynamic, it''s best to set cache to ''no''',
   `date_added` datetime DEFAULT NULL,
   `last_modified` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   `last_modified_by` int(10) unsigned NOT NULL,
diff --git a/fuel/modules/fuel/views/_blocks/inline_edit_bar.php b/fuel/modules/fuel/views/_blocks/inline_edit_bar.php
index 44f38c93d..a351b2afb 100644
--- a/fuel/modules/fuel/views/_blocks/inline_edit_bar.php
+++ b/fuel/modules/fuel/views/_blocks/inline_edit_bar.php
@@ -12,7 +12,7 @@
 		document.write('<script type="text/javascript" charset="utf-8" src="<?=js_path('jquery/jquery', 'fuel')?>"><\/script>');
 	}
 	
-	// must be less then version 1.9 or we will load campatability helper
+	// must be less then version 1.9 or we will load compatibility helper
 	var __jq_version__ = jQuery.fn.jquery.split('.');
 		if (parseInt(__jq_version__[0]) > 1 || (parseInt(__jq_version__[0]) == 1 && parseInt(__jq_version__[1]) >= 9)){
 			jQuery.migrateMute = true;
diff --git a/fuel/modules/fuel/views/_docs/general/constants.php b/fuel/modules/fuel/views/_docs/general/constants.php
index 19de49542..b491c2e2a 100644
--- a/fuel/modules/fuel/views/_docs/general/constants.php
+++ b/fuel/modules/fuel/views/_docs/general/constants.php
@@ -21,7 +21,7 @@
 </ul>
 
 <h2>Constants for Advanced Modules</h2>
-<p>When creating an advanced module, you should also create a constants file at <span class="file">/fuel/modules/{module}/config/{module}_constnats.php</span> 
+<p>When creating an advanced module, you should also create a constants file at <span class="file">/fuel/modules/{module}/config/{module}_constants.php</span>
 with at least the following constants:</p>
 <pre class="brush:php">
 define('{MY_MODULE}_VERSION', '1.0');
diff --git a/fuel/modules/fuel/views/_docs/general/dashboards.php b/fuel/modules/fuel/views/_docs/general/dashboards.php
index 412a01ec0..1b8190bcb 100644
--- a/fuel/modules/fuel/views/_docs/general/dashboards.php
+++ b/fuel/modules/fuel/views/_docs/general/dashboards.php
@@ -1,5 +1,5 @@
 <h1>Dashboards</h1>
-<p>The FUEL CMS dashboard is the intial page that appears after a successful normal login. By default, it displays recent activity within the system, FUEL blog news, 
+<p>The FUEL CMS dashboard is the initial page that appears after a successful normal login. By default, it displays recent activity within the system, FUEL blog news,
 as well as a link to site specific documentation created in the <span class="file">fuel/application/views/_docs/index.php</span> file. 
 However, it also allows you with the ability to include your own content. To do so, you can create an advanced module (e.g. my_module) with a controller named <dfn>Dashboard</dfn>. 
 You then include your dashboard in the FUEL configuration by adding your advanced module's name to your <span class="file">fuel/application/config/MY_fuel.php</span> file:
diff --git a/fuel/modules/fuel/views/_docs/general/extending.php b/fuel/modules/fuel/views/_docs/general/extending.php
index ecdb52283..96b6b1c4f 100644
--- a/fuel/modules/fuel/views/_docs/general/extending.php
+++ b/fuel/modules/fuel/views/_docs/general/extending.php
@@ -1,5 +1,5 @@
 <h1>Extending FUEL CMS</h1>
-<p>FUEL CMS provides a number of ways for you to expand and customize it's functionality. This page just provides a consolodation of the most common ways:</p>
+<p>FUEL CMS provides a number of ways for you to expand and customize it's functionality. This page just provides a consolidation of the most common ways:</p>
 
 <ul>
 	<li><a href="<?=user_guide_url('libraries/my_model')?>">Model Hooks</a>: Create custom callbacks after inserting, updating, saving (inserting or updating) and deleting model data</li>
diff --git a/fuel/modules/fuel/views/_docs/general/forms.php b/fuel/modules/fuel/views/_docs/general/forms.php
index 0cb231ea6..6bcaae026 100644
--- a/fuel/modules/fuel/views/_docs/general/forms.php
+++ b/fuel/modules/fuel/views/_docs/general/forms.php
@@ -1167,7 +1167,7 @@ function my_custom_field($params)
 	<ul>
 		<li><strong>module</strong>: the module whose data will be displayed</li>
 		<li><strong>create_button_label</strong>: the label of the create button</li>
-		<li><strong>create_url_params</strong>: additional intialization parameters to pass when creating a new record. This is often used to pre-populate form field values. Also, since they are passed as query string parameters, you can use $this->CI->input->get('my_param') to dyanmically change elements in your form (e.g. make some fields hidden).</li>
+		<li><strong>create_url_params</strong>: additional initialization parameters to pass when creating a new record. This is often used to pre-populate form field values. Also, since they are passed as query string parameters, you can use $this->CI->input->get('my_param') to dyanmically change elements in your form (e.g. make some fields hidden).</li>
 		<li><strong>edit_url_params</strong>: similar to <dfn>create_url_params</dfn> but for editing a record.</li>
 		<li><strong>display_fields</strong>: an array of fields to display when editing or creating.</li>
 		<li><strong>method</strong>: the method on the model that returns the data table. The default is the built-in get_embedded_list_items method</li>
diff --git a/fuel/modules/fuel/views/_docs/general/inline-editing.php b/fuel/modules/fuel/views/_docs/general/inline-editing.php
index 94780f847..3b8f74056 100644
--- a/fuel/modules/fuel/views/_docs/general/inline-editing.php
+++ b/fuel/modules/fuel/views/_docs/general/inline-editing.php
@@ -43,7 +43,7 @@
 <img src="<?=img_path('screens/inline_editing_toolbar.jpg', FUEL_FOLDER)?>" class="screen" />
 
 <h2>Module Inline Editing</h2>
-<p>For those pages that may not be editible, you can still allow for module data to be edited (e.g. news items).
+<p>For those pages that may not be editable, you can still allow for module data to be edited (e.g. news items).
 The top right area <strong>will not</strong> have the controls for page publish status, caching or layouts and will look like the following:</p>
 <img src="<?=img_path('screens/inline_editing.jpg', FUEL_FOLDER)?>" class="screen" />
 
diff --git a/fuel/modules/fuel/views/_docs/general/javascript.php b/fuel/modules/fuel/views/_docs/general/javascript.php
index c3d475983..e7d055203 100644
--- a/fuel/modules/fuel/views/_docs/general/javascript.php
+++ b/fuel/modules/fuel/views/_docs/general/javascript.php
@@ -98,7 +98,7 @@
 $this->form_builder->set_fields($fields);
 $this->form_builder->render();
 </pre>
-<p class="important">Addtional parameters for the AJAX method can be passed via query pamareters (e.g. ?state=OR)</p>
+<p class="important">Additional parameters for the AJAX method can be passed via query parameters (e.g. ?state=OR)</p>
 
 
 <h2 id="jqx">jQX Framework</h2>
@@ -112,7 +112,7 @@
 </ul>
 
 <h3>jQX Module Initialization Parameters</h3>
-<p>There are additional module initialization parameters you can set in your <span class="file">fuel/application/confg/MY_fuel_modules.php</span>.if you are using a jQX controller which include:</p>
+<p>There are additional module initialization parameters you can set in your <span class="file">fuel/application/config/MY_fuel_modules.php</span>.if you are using a jQX controller which include:</p>
 <ul>
 	<li><strong>js_controller</strong>: the name of the file and thus controller to use. The default is the BaseFuelController.js</li>
 	<li><strong>js_controller_path</strong>: the object/folder path to the controller. The default is <dfn>fuel.controller.BaseFuelController</dfn> (folder slashes are simply replaced with dots)</li>
@@ -162,8 +162,8 @@
 <p>The following jqx config parameters are available for you to use in your jQX controller:</p>
 <ul>
 	<li><strong>jqx.config.basePath:</strong> The equivalent value to the <a href="http://ellislab.com/codeigniter/user-guide/helpers/url_helper.html" target="_blank">site_url()</a> CI function </li>
-	<li><strong>jqx.config.jsPath:</strong> The path to the fuel modoules javascript folder which is <span class="file">/fuel/modules/fuel/assets/js/</span></li>
-	<li><strong>jqx.config.imgPath:</strong> The path to the fuel modoules images folder which is <span class="file">/fuel/modules/fuel/assets/images/</span></li>
+	<li><strong>jqx.config.jsPath:</strong> The path to the fuel modules javascript folder which is <span class="file">/fuel/modules/fuel/assets/js/</span></li>
+	<li><strong>jqx.config.imgPath:</strong> The path to the fuel modules images folder which is <span class="file">/fuel/modules/fuel/assets/images/</span></li>
 	<li><strong>jqx.config.uriPath:</strong> The equivalent to the <a href="<?=user_guide_url('helpers/my_url_helper')?>">uri_path()</a> function</li>
 	<li><strong>jqx.config.assetsImgPath:</strong> The path the sites images (e.g. <span class="file">/assets/images/</span>)</li>
 	<li><strong>jqx.config.assetsPath:</strong> The path the sites images (e.g. <span class="file">/assets/</span>)</li>
diff --git a/fuel/modules/fuel/views/_docs/general/layouts.php b/fuel/modules/fuel/views/_docs/general/layouts.php
index a8b11cf9f..a3d82fd4e 100644
--- a/fuel/modules/fuel/views/_docs/general/layouts.php
+++ b/fuel/modules/fuel/views/_docs/general/layouts.php
@@ -36,10 +36,10 @@
 
 <h2 id="layouts_cms">Using Layouts in the CMS</h2>
 <p>For a layout to appear in the FUEL admin, a layout view file must exist in the <span class="file">fuel/application/views/_layouts/</span> folder AND 
-there must be an entry in the <span class="file">fuel/application/config/MY_fuel_layouts.php</span> file. The latter, assigns the variable fields to the layout and signals that the layout can be used to create pages in the admin.<p>
+there must be an entry in the <span class="file">fuel/application/config/MY_fuel_layouts.php</span> file. The latter assigns the variable fields to the layout and signals that the layout can be used to create pages in the admin.<p>
 
 <p>As of version 1.0, there are two ways to assign layouts in the <span class="file">MY_fuel_layouts.php</span> file. The first being the old way of assigning the layout variables to the 
-<dfn>fields</dfn> key which is a multi-demensional array that will be used by <a href="<?=user_guide_url('libraries/form_builder')?>">Form_builder</a>.</p>
+<dfn>fields</dfn> key which is a multi-dimensional array that will be used by <a href="<?=user_guide_url('libraries/form_builder')?>">Form_builder</a>.</p>
 
 <p class="important">Note that there was a change in version 1.0 that all layout information exists under a single key in the <dfn>$config['layouts']</dfn> array and all fields now exist as a child under the "fields" key.</p>
 
@@ -78,7 +78,7 @@
 $main_layout->add_fields($common_meta);
 $main_layout->add_field('Sections',  array('type' => 'fieldset', 'label' => 'Sections', 'class' => 'tab'));
 $main_layout->add_field('section_description', array('type' => 'copy', 'label' => 'The following fields control the sections of the legal page.'));
-$main_layout->add_field('sections', array('display_label' => FALSE, 'add_extra' => FALSE, 'init_display' => 'none', 'dblclick' => 'accordian', 'repeatable' => TRUE, 'style' => 'width: 900px;', 'type' => 'template', 'label' => 'Page sections', 'title_field' => 'title',
+$main_layout->add_field('sections', array('display_label' => FALSE, 'add_extra' => FALSE, 'init_display' => 'none', 'dblclick' => 'accordion', 'repeatable' => TRUE, 'style' => 'width: 900px;', 'type' => 'template', 'label' => 'Page sections', 'title_field' => 'title',
 											'fields' => array(
 												'sections' => array('type' => 'section', 'label' => '{__title__}'),
 												'title' => array('style' => 'width: 800px'),
@@ -90,7 +90,7 @@
 
 <p class="important"><strong>What is all this other stuff in the "Sections area"?</strong> We added this to the example just to show how complicated you can get with the layouts. The above is using 
 several new features including the addition of the class "tabs" which can be applied to a "type" of "fieldset" and creates tabs for your forms automatically. We are also
-displaying the new field type of "template", which gives you the power to easilty create complicated repeatable forms that you can reorder and nest inside other forms. 
+displaying the new field type of "template", which gives you the power to easily create complicated repeatable forms that you can reorder and nest inside other forms.
 For more details visit the <a href="#">Form_builder</a> page.</p>
 
 
@@ -123,7 +123,7 @@
 );
 </pre>
 <h3>Layouts As Their Own Class Files</h3>
-<p>Similarly, you can overwite the extended <dfn>Fuel_layout</dfn> classes <dfn>fields()</dfn> method to return the fields for your layout:</p>
+<p>Similarly, you can overwrite the extended <dfn>Fuel_layout</dfn> classes <dfn>fields()</dfn> method to return the fields for your layout:</p>
 <span class="file">fuel/application/config/MY_fuel_layouts.php</span><br />
 <pre class="brush:php">
 $config['layouts']['home'] = array(
diff --git a/fuel/modules/fuel/views/_docs/general/localization.php b/fuel/modules/fuel/views/_docs/general/localization.php
index 78351aebc..d8914f8a5 100644
--- a/fuel/modules/fuel/views/_docs/general/localization.php
+++ b/fuel/modules/fuel/views/_docs/general/localization.php
@@ -83,7 +83,7 @@
 
 
 <h2>Changing the Language Displayed in the CMS</h2>
-<p>The default installation of FUEL CMS currently only comes with the English langauge. 
+<p>The default installation of FUEL CMS currently only comes with the English language.
 However, localization efforts are underway on the <a href="https://github.com/daylightstudio/FUEL-CMS-Languages" target="_blank">FUEL CMS Languages GitHub repo</a>.
 If you are interested in helping out with language support, just let us know or send us a pull request (we love those).</p>
 
@@ -91,13 +91,13 @@
 <p>To add a language to FUEL, you must <a href="https://github.com/daylightstudio/FUEL-CMS-Languages" target="_blank">download the latest 1.0 language folder (if available).</a> and
 place it's contents in the <span class="file">fuel/modules/fuel/language</span> folder. Then, you can set the <dfn>$config['language']</dfn> in the <span class="file">fuel/application/config/config.php</span>
 file to match the name of the language folder you downloaded. Alternatively, you may click on your user name in the upper right corner of the CMS, and then change the language associated
-with your urser login.</p>
+with your user login.</p>
 
 
 <p>The following are some key areas in which you can utilize FUEL's localization functionality.</p>
 
 <h2>The lang() Function</h2>
-<p>The <a href="<?=user_guide_url('helpers/my_language_helper#func_lang')?>">lang()</a> overwrites the CodeIgniter lang() function to provide the added benfits of passing arguments to your language files (uses sprintf() function).</p>
+<p>The <a href="<?=user_guide_url('helpers/my_language_helper#func_lang')?>">lang()</a> overwrites the CodeIgniter lang() function to provide the added benefits of passing arguments to your language files (uses sprintf() function).</p>
 
 <h2>The json_lang() Function</h2>
 <p>The <a href="<?=user_guide_url('helpers/my_language_helper#func_json_lang')?>">json_lang()</a> function allows for language values to be passed to the javascript. This function creates a Javascript JSON object based on an array of language key values.</p>
diff --git a/fuel/modules/fuel/views/_docs/general/logs.php b/fuel/modules/fuel/views/_docs/general/logs.php
index d2cd56b98..f5addf0d5 100644
--- a/fuel/modules/fuel/views/_docs/general/logs.php
+++ b/fuel/modules/fuel/views/_docs/general/logs.php
@@ -1,3 +1,3 @@
 <h1>Activity Log</h1>
-<p>FUEL keeps track of the activity in the system under the Activity Log. This information may be usefuel for debugging purposes. It also
+<p>FUEL keeps track of the activity in the system under the Activity Log. This information may be useful for debugging purposes. It also
 provides recent activity on the dashboard.</p>
\ No newline at end of file
diff --git a/fuel/modules/fuel/views/_docs/general/models.php b/fuel/modules/fuel/views/_docs/general/models.php
index 221d6dacd..2efcc73a1 100644
--- a/fuel/modules/fuel/views/_docs/general/models.php
+++ b/fuel/modules/fuel/views/_docs/general/models.php
@@ -100,7 +100,7 @@ function get_quote_formatted()
 <ul>
 	<li><a href="<?=user_guide_url('libraries/my_model#my_model')?>"><strong>Table Class</strong> - in charge of retrieving, validating and saving data to the data source</a></li>
 	<li><a href="<?=user_guide_url('libraries/my_model#data_set')?>"><strong>Data Set Class</strong> - the result object returned by the table class after retrieving data (normally not directly used)</a></li>
-	<li><a href="<?=user_guide_url('libraries/my_model#data_record')?>"><strong>Record Class (optional)</strong> - the custom object(s) returned by a retrieving query that contains at a minimum the column attibutes of the table</a></li>
+	<li><a href="<?=user_guide_url('libraries/my_model#data_record')?>"><strong>Record Class (optional)</strong> - the custom object(s) returned by a retrieving query that contains at a minimum the column attributes of the table</a></li>
 	<li><a href="<?=user_guide_url('libraries/my_model#data_field')?>"><strong>Field Class (optional)</strong> - the custom object for a specific field. By default, it will simply return the value in the database</a></li>
 </ul>
 
@@ -264,7 +264,7 @@ function __construct()
 <p>Sometimes, but not as often, you may want a field to be a specific object instead just a string or integer value. 
 MY_Model provides a <dfn>custom_fields</dfn> property that allows you to map specific classes to fields. 
 The value can be an array with the keys being the field name, and the values can either be string values, referencing the class name,
-or an array specfying the module (key) and the class name (value). You can also pass in initialization parameters to the class with the <dfn>init</dfn>
+or an array specifying the module (key) and the class name (value). You can also pass in initialization parameters to the class with the <dfn>init</dfn>
 parameter. Below are some examples:</p>
 
 <pre class="brush:php">
@@ -376,7 +376,7 @@ function if the property is a string value and if it is a date value will format
 this method in your model and have one of these relationships assigned to your model, you must call parent::on_after_save($values); to properly save the relationship information.
 </p>
 <h3>Foreign Keys</h3>
-<p>The <dfn>foreign_key</dfn> model property will dynamically bind the foriegn key's record object to the declared model's record object. So for example,
+<p>The <dfn>foreign_key</dfn> model property will dynamically bind the foreign key's record object to the declared model's record object. So for example,
 say you have a products model. Each product can belong to only one category. In this case, we can use FUEL's built in <a href="<?=user_guide_url('general/tags-categories#categories')?>">Categories</a>
 module to make the relationship like so:</p>
 <pre class="brush:php">
@@ -577,7 +577,7 @@ function __construct()
 	<li><strong>on_after_save</strong> - executed after saving and passed an array of cleaned data</li>
 	<li><strong>on_before_delete</strong> - executed before deleting</li>
 	<li><strong>on_after_delete</strong> - executed after deleting</li>
-	<li><strong>on_before_post</strong> - to be called from within your own code right before processing post data and passed the $_POST variables. Simple modules have this hook implemented and you can add this hook to manupulate $_POST values before being saved</li>
+	<li><strong>on_before_post</strong> - to be called from within your own code right before processing post data and passed the $_POST variables. Simple modules have this hook implemented and you can add this hook to manipulate $_POST values before being saved</li>
 	<li><strong>on_after_post</strong> - to be called from within your own code after posting data. Simple modules have this hook implemented and the values passed to it is the processed $_POST array after placeholder substitutions and <a href="<?=user_guide_url('general/forms#pre_post_processing')?>">Form_builder post_processing hooks have been run</a>. An example of using this hook would be to access images after they've been uploaded for further manipulation. </li>
 	<li><strong>on_duplicate</strong> - executed when a record class is duplicated</li>
 	<li><strong>on_created</strong> - executed when a record class is created</li>
diff --git a/fuel/modules/fuel/views/_docs/general/navigation.php b/fuel/modules/fuel/views/_docs/general/navigation.php
index d9a2cb6b7..2ce9ea9b5 100644
--- a/fuel/modules/fuel/views/_docs/general/navigation.php
+++ b/fuel/modules/fuel/views/_docs/general/navigation.php
@@ -21,7 +21,7 @@
 
 <h2>Navigation Structures</h2>
 <p>There are two ways to create navigation structures in FUEL. The first way, is to create a 
-<dfn>$nav</dfn> array in the file located at <span class="file">fuel/applicaiton/views/_variables/nav.php</span> like below:</p>
+<dfn>$nav</dfn> array in the file located at <span class="file">fuel/application/views/_variables/nav.php</span> like below:</p>
  
 <span class="file">fuel/application/views/_variables/nav.php</span>
 <pre class="brush: php">
diff --git a/fuel/modules/fuel/views/_docs/general/opt-in-controllers.php b/fuel/modules/fuel/views/_docs/general/opt-in-controllers.php
index abc4392b9..be13492b0 100644
--- a/fuel/modules/fuel/views/_docs/general/opt-in-controllers.php
+++ b/fuel/modules/fuel/views/_docs/general/opt-in-controllers.php
@@ -48,7 +48,7 @@
 <p><strong>Controller variables</strong> are applied to what would normally be the controller level of a website. For example,
 If you have an <strong>about</strong> section of your website at http://www.mysite.com/about, you can create a <dfn>views/_variables/about.php</dfn>
 a variables file at <dfn>views/_variables/about.php</dfn> can be used. Variables in this file will overwrite any global variable with the same key.
-The variables will be extened automatically to all sub pages of the about section (e.g. http://www.mysite.com/about/contact) .
+The variables will be extended automatically to all sub pages of the about section (e.g. http://www.mysite.com/about/contact) .
 Variables at the controller level use the same <dfn>$vars</dfn> variable as global variables.
 </p>
 <pre class="brush:php">
@@ -78,7 +78,7 @@
 
 <h2>Adding Variables from Within the View</h2>
 <p>An alternative to creating <dfn>$pages</dfn> variables is to simply declare the variable in the view file using the 
-fuel helper function <dfn>fuel_set_var</dfn>. By setting the varialbe this way, you will ensure that the variable will also get
+fuel helper function <dfn>fuel_set_var</dfn>. By setting the variable this way, you will ensure that the variable will also get
 passed to the layout file containing the view file.
 </p>
 
diff --git a/fuel/modules/fuel/views/_docs/general/pages-variables.php b/fuel/modules/fuel/views/_docs/general/pages-variables.php
index 9245082e0..b4a7e2c3b 100644
--- a/fuel/modules/fuel/views/_docs/general/pages-variables.php
+++ b/fuel/modules/fuel/views/_docs/general/pages-variables.php
@@ -14,7 +14,7 @@
 <h2>Static Page - about</h2>
 
 <h3>Opt-In Controller Method</h3>
-<p>There are several ways to create a page in FUEL. The easest way is to simply create a view file. We call this method the <a href="<?=user_guide_url('general/opt-in-controllers')?>">Opt-In Controller</a> Method. This allows you to create pages without the need for a controller. A URI path of <strong>about/contact</strong> would have a view file created at <strong>views/about/contact.php</strong>. The method has some extra benefits like having deep path structures and hyphens in the path without the need of routing.</p>
+<p>There are several ways to create a page in FUEL. The easiest way is to simply create a view file. We call this method the <a href="<?=user_guide_url('general/opt-in-controllers')?>">Opt-In Controller</a> Method. This allows you to create pages without the need for a controller. A URI path of <strong>about/contact</strong> would have a view file created at <strong>views/about/contact.php</strong>. The method has some extra benefits like having deep path structures and hyphens in the path without the need of routing.</p>
 
 <p>For this tutorial we will make the <dfn>about</dfn> page a static view file. To do that, create the following file at <dfn>application/views/about.php</dfn>: </p>
 
@@ -281,7 +281,7 @@ function get_excerpt_formatted($char_limit = NULL, $readmore = '')
 </pre>
 
 <h4>Set auto_search_views configuration in MY_fuel.php</h4>
-<p>In the <dfn>fuel/application/config/MY_fuel.php</dfn>, set the "auto_search_views" configuration paramter to TRUE:</p>
+<p>In the <dfn>fuel/application/config/MY_fuel.php</dfn>, set the "auto_search_views" configuration parameter to TRUE:</p>
 <pre class="brush: php">
 	$config['auto_search_views'] = FALSE;
 </pre>
diff --git a/fuel/modules/fuel/views/_docs/general/redirects.php b/fuel/modules/fuel/views/_docs/general/redirects.php
index 731fa0e92..19d6ed4b0 100644
--- a/fuel/modules/fuel/views/_docs/general/redirects.php
+++ b/fuel/modules/fuel/views/_docs/general/redirects.php
@@ -42,7 +42,7 @@
 
 <h3 id="ssl">SSL</h3>
 <p>The <dfn>ssl</dfn> configuration provides an easy way to force SSL encryption (https) for your page URLs. The following example would 
-restrict any url under "store" to use SSL encription when in the "production" environment:</p>
+restrict any url under "store" to use SSL encryption when in the "production" environment:</p>
 <pre class="brush:php">
 $config['ssl'] = array('production' => array(
 	'^store|store/:any'
@@ -51,8 +51,8 @@
 
 <h3 id="non_ssl">Non SSL</h3>
 <p>The <dfn>non_ssl</dfn> configuration provides an easy way to force pages that are in SSL to not be encrypted (opposite of SSL). If there is an <dfn>ssl</dfn> configuration 
-that conflicts with a <dfn>non_ssl</dfn>, then the <dfn>ssl</dfn> will take precedence and ignore the <dfn>non_ssl</dfn> to prevent infinte redirects.
-The following example would redirect any url under "about" to NOT use SSL encription when in the "production" environment:</p>
+that conflicts with a <dfn>non_ssl</dfn>, then the <dfn>ssl</dfn> will take precedence and ignore the <dfn>non_ssl</dfn> to prevent infinite redirects.
+The following example would redirect any url under "about" to NOT use SSL encryption when in the "production" environment:</p>
 <pre class="brush:php">
 $config['non_ssl'] = array('production' => array(
 	'^about|about/:any'
diff --git a/fuel/modules/fuel/views/_docs/general/security.php b/fuel/modules/fuel/views/_docs/general/security.php
index c3cde37bd..b5ce85e73 100644
--- a/fuel/modules/fuel/views/_docs/general/security.php
+++ b/fuel/modules/fuel/views/_docs/general/security.php
@@ -21,7 +21,7 @@
 	<li><strong>sanitize_input</strong> - cleans the input before inserting or updating the data source. 
 		A value of <dfn>TRUE</dfn>, will apply the <a href="http://ellislab.com/codeigniter/user-guide/helpers/security_helper.html" target="_blank">xss_clean</a> function. 
 		A value of <dfn>FALSE</dfn>, will apply no sanitation functions.
-		You can use an array to appy more then one function to sanitize your input.
+		You can use an array to apply more than one function to sanitize your input.
 		The list of functions to sanitize the input is set by the <dfn>module_sanitize_funcs</dfn> <a href="<?=user_guide_url('installation/configuration')?>">FUEL configuration</a> value under the security settings.
 		The default values are listed below:
 		<ul>
diff --git a/fuel/modules/fuel/views/_docs/general/tags-categories.php b/fuel/modules/fuel/views/_docs/general/tags-categories.php
index 2031be26b..141f65f8c 100644
--- a/fuel/modules/fuel/views/_docs/general/tags-categories.php
+++ b/fuel/modules/fuel/views/_docs/general/tags-categories.php
@@ -46,7 +46,7 @@ class Widgets_model extends Base_module_model {
 
 
 <h2 id="categories">Categories</h2>
-<p>The category module is helpful for categorizing records. A catgory's <dfn>context</dfn> value can be used to further group categories together.
+<p>The category module is helpful for categorizing records. A category's <dfn>context</dfn> value can be used to further group categories together.
 You can use the a model's <dfn>foreign_key</dfn> property as well as the addition of the <dfn>where</dfn> parameter to target 
 a particular context (if needed) and associate a single category to a particular record. This will create a dropdown select for the module form in the CMS:</p>
 
diff --git a/fuel/modules/fuel/views/_docs/general/template-parsing.php b/fuel/modules/fuel/views/_docs/general/template-parsing.php
index 8eea3848f..e082526bd 100644
--- a/fuel/modules/fuel/views/_docs/general/template-parsing.php
+++ b/fuel/modules/fuel/views/_docs/general/template-parsing.php
@@ -35,7 +35,7 @@
 $config['parser_refs'] = array('config', 'load', 'session', 'uri', 'input', 'user_agent');
 </pre>
 
-<p class="important"><strong>Note that the default parsing delimieters are set to "{" and "}" which is different then the default Twig parsing parameters. This is done for legacy reasons.</strong></p>
+<p class="important"><strong>Note that the default parsing delimiters are set to "{" and "}" which is different then the default Twig parsing parameters. This is done for legacy reasons.</strong></p>
 
 <h3>Fuel_parser Class</h3>
 <p>New to FUEL CMS 1.3 is the <a href="<?=user_guide_url('libraries/fuel_parser')?>">Fuel_parser</a> class which provides a unified way to dealing with the different parsing engines now available in FUEL.</p>
@@ -44,12 +44,12 @@
 <h3>String Helper Functions</h3>
 <p>FUEL comes with the following <a href="<?=user_guide_url('helpers/my_string_helper')?>">string helper functions</a> to help with parsing and converting from the Dwoo templating syntax:</p>
 <ul>
-	<li>php_to_template_syntax - Convert PHP syntax to the specified emplating syntax (as best it can). Must use the PHP alternative syntax for if and foreach loops to be translated correctly.</li>
+	<li>php_to_template_syntax - Convert PHP syntax to the specified templating syntax (as best it can). Must use the PHP alternative syntax for if and foreach loops to be translated correctly.</li>
 	<li>parse_template_syntax - Parses a strings specified templating syntax.</li>
 </ul>
 
 <p class="important"><strong>The below documentation is specific to the Dwoo templating engine. 
-	See the <a href="http://twig.sensiolabs.org" target="_blank">Twig documenation</a> for Twig specific documentation.</strong>
+	See the <a href="http://twig.sensiolabs.org" target="_blank">Twig documentation</a> for Twig specific documentation.</strong>
 </p>
 
 <h3>Non-Namespaced Functions</h3>
@@ -78,7 +78,7 @@
 	<li>{fuel_nav(array(key="val"...))} - Maps to the <a href="<?=user_guide_url('helpers/fuel_helper#func_fuel_nav')?>">fuel_nav()</a> function.</li>
 	<li>{fuel_edit(id, label, module, xOffset, yOffset)} - Maps to the <a href="<?=user_guide_url('helpers/fuel_helper#func_fuel_edit')?>">fuel_edit()</a> function.</li>
 </ul>
-<p class="important">Note that several of the functions require an associative array paramter with the <dfn>key="val"</dfn> syntax.</p>
+<p class="important">Note that several of the functions require an associative array parameter with the <dfn>key="val"</dfn> syntax.</p>
 
 <h3>Blocks</h3>
 <p>Tag pairs allow you to loop through arrays of data. The syntax requires an opening <dfn>{my_var}</dfn> and closing <dfn>{/my_var}</dfn> tag. 
diff --git a/fuel/modules/fuel/views/_docs/helpers/markdown_helper.php b/fuel/modules/fuel/views/_docs/helpers/markdown_helper.php
index 42fe1dfe5..2b146c17c 100644
--- a/fuel/modules/fuel/views/_docs/helpers/markdown_helper.php
+++ b/fuel/modules/fuel/views/_docs/helpers/markdown_helper.php
@@ -2,8 +2,8 @@
 
 <p>This helper has the markdown function originally developed by 
 <a href="http://daringfireball.net/projects/markdown/" target="_blank">John Gruber</a> 
-and modifed by <a href="http://www.michelf.com/projects/php-markdown/">Michel Fortin</a>
-to be used for PHP. It has some similar characteristics to the autotypography function in the
+and modified by <a href="http://www.michelf.com/projects/php-markdown/">Michel Fortin</a>
+to be used for PHP. It has some similar characteristics to the auto_typography function in the
 typography helper. 
 
 <p>This helper is loaded using the following code:</p>
diff --git a/fuel/modules/fuel/views/_docs/index.php b/fuel/modules/fuel/views/_docs/index.php
index 5a428dcf8..4f11bbccf 100644
--- a/fuel/modules/fuel/views/_docs/index.php
+++ b/fuel/modules/fuel/views/_docs/index.php
@@ -7,7 +7,7 @@
 
 <p>FUEL CMS evolved out of the need for having a development platform that
 was a framework first and a CMS second. CodeIgniter was chosen as the framework because it is
-a popular, well-documentated, lightweight, PHP framework and allows you to cleanly structure your code
+a popular, well-documented, lightweight, PHP framework and allows you to cleanly structure your code
 using MVC principles.
 </p>
 
diff --git a/fuel/modules/fuel/views/_docs/introduction/interface.php b/fuel/modules/fuel/views/_docs/introduction/interface.php
index e9c7cab67..39a2740b6 100644
--- a/fuel/modules/fuel/views/_docs/introduction/interface.php
+++ b/fuel/modules/fuel/views/_docs/introduction/interface.php
@@ -5,7 +5,7 @@
  The intention is to get you generally oriented with the interface.</p>
 
 <h2>Dashboard</h2>
-<p>Below is a standrd FUEL Dashboard that will appear right after you login.
+<p>Below is a standard FUEL Dashboard that will appear right after you login.
 Different modules can hook into the dashboard view so it may look slightly different
 for you based on the modules you have installed.
 </p>
diff --git a/fuel/modules/fuel/views/_docs/introduction/what-is-fuel.php b/fuel/modules/fuel/views/_docs/introduction/what-is-fuel.php
index b64897733..1dce26c6e 100644
--- a/fuel/modules/fuel/views/_docs/introduction/what-is-fuel.php
+++ b/fuel/modules/fuel/views/_docs/introduction/what-is-fuel.php
@@ -5,7 +5,7 @@
 
 <p>FUEL CMS evolved out of the need for having a development platform that
 was a framework first and a CMS second. <a href="http://ellislab.com/codeigniter" target="_blank">CodeIgniter</a> was chosen as the framework because it is
-a popular, well-documentated, lightweight, PHP framework and allows you to cleanly structure your code
+a popular, well-documented, lightweight, PHP framework and allows you to cleanly structure your code
 using MVC principles.
 </p>
 
diff --git a/fuel/modules/fuel/views/_docs/introduction/whats-new.php b/fuel/modules/fuel/views/_docs/introduction/whats-new.php
index 246551a6e..1d72c0f5a 100644
--- a/fuel/modules/fuel/views/_docs/introduction/whats-new.php
+++ b/fuel/modules/fuel/views/_docs/introduction/whats-new.php
@@ -94,7 +94,7 @@
 
 <h3>Base_module_model</h3>
 <ul>
-	<li>Added ability to set related items panels information (e.g. related permssions in the permissions module)</li>
+	<li>Added ability to set related items panels information (e.g. related permissions in the permissions module)</li>
 	<li>Simplified the ability to create tree structures for models that have has_many, belongs_to or foreign_key relationships</li>
 	<li>Added ability to export data from module by adding an "export_data" method to your module's model</li>
 	<li>Added ability to replace record values with existing ones. This is useful in situations where you have say a published page at the location
@@ -152,7 +152,7 @@
 <ul>
 	<li>Added inline editing tools in the toolbar that other modules can take advantage of (e.g. the page_analysis module and validation module)</li>
 	<li>Ability to add more then one field to display to edit if separated by a ":" (e.g. <dfn>&lt;?=fuel_edit($item->id.'|title:slug', 'Edit:'.$item->title, 'news')?&gt;</dfn></li>
-	<li>Ability to pass additional parameters (e.g. foriegn key values) when creating a new record (e.g. <dfn>&lt;?=fuel_edit('create?title=TITLE%20GOES%20SHERE', 'Add', 'news')?&gt;</dfn></li>
+	<li>Ability to pass additional parameters (e.g. foreign key values) when creating a new record (e.g. <dfn>&lt;?=fuel_edit('create?title=TITLE%20GOES%20HERE', 'Add', 'news')?&gt;</dfn></li>
 	<li>Allow for displaying unpublished content on the front end if you are logged in. Will display a slightly different icon if unpublished or not active (display_unpublished_if_logged_in property on model is set to TRUE)</li>
 </ul>
 
diff --git a/fuel/modules/fuel/views/_docs/libraries/fuel_base_controller.php b/fuel/modules/fuel/views/_docs/libraries/fuel_base_controller.php
index 2878d0f01..98c4e18f6 100644
--- a/fuel/modules/fuel/views/_docs/libraries/fuel_base_controller.php
+++ b/fuel/modules/fuel/views/_docs/libraries/fuel_base_controller.php
@@ -1,5 +1,5 @@
 <h1>Fuel Base Controller Class</h1>
-<p>The <dfn>Fuel_base_controller</dfn> Class should be used for CMS controllers. It is in charge of initilizing the <dfn>Fuel_admin</dfn> class
+<p>The <dfn>Fuel_base_controller</dfn> Class should be used for CMS controllers. It is in charge of initializing the <dfn>Fuel_admin</dfn> class
 which is used to display the various aspects of the CMS. Below is an example of how to use it for your own CMS controllers.</p>
 
 <h3>Example</h3>
diff --git a/fuel/modules/fuel/views/_docs/libraries/my_typography.php b/fuel/modules/fuel/views/_docs/libraries/my_typography.php
index 0c681c48d..9eefa406f 100644
--- a/fuel/modules/fuel/views/_docs/libraries/my_typography.php
+++ b/fuel/modules/fuel/views/_docs/libraries/my_typography.php
@@ -1,3 +1,3 @@
-<h1>MY_Typographyd Class</h1>
+<h1>MY_Typography Class</h1>
 <p>This extended class just contains a minor adjustment to the auto_typography to escape templating syntax so it can be properly parsed.
 The escaping happens by default but if you do want to escape the quote, set a third parameter to <dfn>FALSE</dfn>.</p>
\ No newline at end of file
diff --git a/fuel/modules/fuel/views/_docs/modules.php b/fuel/modules/fuel/views/_docs/modules.php
index f29e32655..b503a5f9e 100644
--- a/fuel/modules/fuel/views/_docs/modules.php
+++ b/fuel/modules/fuel/views/_docs/modules.php
@@ -42,7 +42,7 @@
 <p>Phil Sturgeon of PyroCMS fame has a good <a href="http://philsturgeon.co.uk/blog/2011/09/managing-codeigniter-packages-with-git-submodules" target="_blank">article on using submodules</a>.</p>
 
 <h3>Finalizing the Installation</h3>
-<p>After adding the folder to your <span class="file">fuel/modules</span> folder either manually or via GIT, you may need to finalize the istallation by running some 
+<p>After adding the folder to your <span class="file">fuel/modules</span> folder either manually or via GIT, you may need to finalize the installation by running some
 additional SQL statements. These SQL statements can be found in your modules "install" folder. FUEL provides a simpler way to install both the SQL and any necessary permissions 
 for the module that can be assigned to other users. To do so, you need to open up a terminal window and "<a href="http://en.wikipedia.org/wiki/Cd_(command)" target="_blank">cd</a>" (change directory) to the 
 to the installation directory (similar to above). Then run the following:</p>
diff --git a/fuel/modules/fuel/views/_docs/modules/advanced.php b/fuel/modules/fuel/views/_docs/modules/advanced.php
index 3677da22a..5d0b20290 100644
--- a/fuel/modules/fuel/views/_docs/modules/advanced.php
+++ b/fuel/modules/fuel/views/_docs/modules/advanced.php
@@ -23,7 +23,7 @@
 				<dfn>$config['nav']['tools']['tools/{module_name}'] = '{module_name}';</dfn><br />
 				This will create a menu <dfn>{module_name}</dfn> in the admin left navigation with a FUEL admin link of <dfn>tools/{module_name}</dfn>.<p>
 
-				As another example, let's look at the blogs configuration file found under <dfn>fuel/modules/blog/config/blog.php</dfn>:</p>
+				As another example, let's look at the blog's configuration file found under <dfn>fuel/modules/blog/config/blog.php</dfn>:</p>
 				
 <pre class="brush: php">
 $config['nav']['blog'] = array(
diff --git a/fuel/modules/fuel/views/_docs/modules/generate.php b/fuel/modules/fuel/views/_docs/modules/generate.php
index 21dd01205..63c148f4e 100644
--- a/fuel/modules/fuel/views/_docs/modules/generate.php
+++ b/fuel/modules/fuel/views/_docs/modules/generate.php
@@ -57,12 +57,12 @@
 <p class="important">Separating module names with a colon will generate multiple models.</p>
 
 <h2 id="simple">Simple Modules</h2>
-<p>The following will create a model named "examples_model.php", generate a placeholder table (you'll need to modify), add the permisions to manage it in the CMS,  and will add it to the <span class="file">fuel/application/config/MY_fuel_modules.php</span>:</p>
+<p>The following will create a model named "examples_model.php", generate a placeholder table (you'll need to modify), add the permissions to manage it in the CMS,  and will add it to the <span class="file">fuel/application/config/MY_fuel_modules.php</span>:</p>
 <pre class="brush:php">
 php index.php fuel/generate/simple examples
 </pre>
 
-<h2 id="advaned">Advanced Modules</h2>
+<h2 id="advanced">Advanced Modules</h2>
 <p>The following will create a directory named "test" in the <span class="file">fuel/modules/</span> folder, as well as create a permission and add it to the "modules_allowed" FUEL configuration.
 It will generate by default the files specified in the
 <a href="<?=user_guide_url('installation/configuration')?>">FUEL configuration file</a> under the <dfn>generated</dfn> parameter:</p>
diff --git a/fuel/modules/fuel/views/_docs/modules/hooks.php b/fuel/modules/fuel/views/_docs/modules/hooks.php
index 585931510..c88987c97 100644
--- a/fuel/modules/fuel/views/_docs/modules/hooks.php
+++ b/fuel/modules/fuel/views/_docs/modules/hooks.php
@@ -12,7 +12,7 @@
 	<li><strong>after_edit_{module}</strong> - executed right AFTER saving the edited module information. The edited module item information is passed as an array to the hook class/function.</li>
 	<li><strong>before_save_{module}</strong> - executed right BEFORE saving module information (for both create and edit). The new/edited posted module item information is passed as an array to the hook class/function.</li>
 	<li><strong>after_save_{module}</strong> - executed right AFTER saving module information (for both create and edit). The new/edited module item information is passed as an array to the hook class/function.</li>
-	<li><strong>before_delete_{module}</strong> - executed right BEFPRE deleting of module item(s). The posted IDs of the items to delete are passed as an array to the hook class/function.</li>
+	<li><strong>before_delete_{module}</strong> - executed right BEFORE deleting of module item(s). The posted IDs of the items to delete are passed as an array to the hook class/function.</li>
 	<li><strong>after_delete_{module}</strong> - executed right AFTER deleting of module item(s). The IDs of the items deleted are passed as an array to the hook class/function.</li>
 </ul>
 
diff --git a/fuel/modules/fuel/views/_docs/modules/simple.php b/fuel/modules/fuel/views/_docs/modules/simple.php
index c5fed3cb3..ada0e0813 100644
--- a/fuel/modules/fuel/views/_docs/modules/simple.php
+++ b/fuel/modules/fuel/views/_docs/modules/simple.php
@@ -609,7 +609,7 @@ class Article_model extends Base_post_item_model {
 <h3>Custom Classes</h3>
 <p>All custom classes come with the following methods that can be used with the class</p>
 <ul>
-	<li><strong>set_parent_model</strong>: Sets the main parent model (done upon initilaization)</li>
+	<li><strong>set_parent_model</strong>: Sets the main parent model (done upon initialization)</li>
 	<li><strong>get_parent_model</strong>: Returns the main parent model</li>
 	<li><strong>set_values</strong>: Sets the current record's values (if any... done upon initialization)</li>
 	<li><strong>append_values</strong>: Appends values to the existing values store.</li>
@@ -778,7 +778,7 @@ public function meta_tab()
 </ul>
 
 <h3>Custom Related Items Class</h3>
-<p>The custom relatd items class can be used to display information that appears to the right of the form fields.</p>
+<p>The custom related items class can be used to display information that appears to the right of the form fields.</p>
 <ul>
 	<li><strong>vars</strong>: By default the following variables are passed to the view file:
 		<ul>
diff --git a/fuel/modules/fuel/views/_docs/modules/tutorial.php b/fuel/modules/fuel/views/_docs/modules/tutorial.php
index c2e02db2a..ed40cf45c 100644
--- a/fuel/modules/fuel/views/_docs/modules/tutorial.php
+++ b/fuel/modules/fuel/views/_docs/modules/tutorial.php
@@ -41,7 +41,7 @@
   <li><strong>create table</strong>: creates a generic table based on the name (last parameter) in the database for you with basic fields you will need to edit to fit your model's requirements.</li>
   <li><strong>created model</strong>: creates a basic model as a starting point to add your code.</li>
   <li><strong>add entry to MY_fuel_modules</strong>: will add an entry in the fuel/application/config/MY_fuel_modules.php file so it will appear in the CMS under the Modules area in the left menu.</li>
-  <li><strong>add permissions</strong>: permissions for the module get automically generated.</li>
+  <li><strong>add permissions</strong>: permissions for the module get automatically generated.</li>
 </ul>
 
 <p>However, since this is a tutorial to learn about the creation of simple modules, we will skip the generate functionality and do these tasks by manually.</p>
@@ -333,7 +333,7 @@ class and gets passed to a <a href="<?=user_guide_url('libraries/form_builder')?
   <li><strong>id</strong>: <a href="<?=user_guide_url('general/forms#hidden')?>">hidden field</a> (Form_builder is set by default to render all fields with the name of "id" as hidden)</li>
   <li><strong>title</strong>: <a href="<?=user_guide_url('general/forms#hidden')?>">title field</a> (a varchar field type gets mapped to a normal input text field)</li>
   <li><strong>slug</strong>: <a href="<?=user_guide_url('general/forms#slug')?>">slug field</a> (a field with the name of "slug" is <a href="<?=user_guide_url('general/forms#representatives')?>">represented</a> by the field type "slug"). </li>
-  <li><strong>author_id</strong>: <a href="<?=user_guide_url('general/forms#select')?>">select field</a> (the select field is set by the model's <dfn>foriegn_keys</dfn> property</li>
+  <li><strong>author_id</strong>: <a href="<?=user_guide_url('general/forms#select')?>">select field</a> (the select field is set by the model's <dfn>foreign_keys</dfn> property</li>
   <li><strong>content</strong>: <a href="<?=user_guide_url('general/forms#wysiwyg')?>">wysiwyg field</a> (text field type gets <a href="<?=user_guide_url('general/forms#representatives')?>">represented</a> by the field type "wysiwyg")</li>
   <li><strong>image</strong>: <a href="<?=user_guide_url('general/forms#asset')?>">asset field</a> (a field containing "image" or "img" in it's name gets <a href="<?=user_guide_url('general/forms#representatives')?>">represented</a> by the field type "asset")</li>
   <li><strong>thumb_image</strong>: <a href="<?=user_guide_url('general/forms#asset')?>">asset field</a> (a field containing "image" or "img" in it's name gets <a href="<?=user_guide_url('general/forms#representatives')?>">represented</a> by the field type "asset")</li>
@@ -519,7 +519,7 @@ class Articles_model extends Base_module_model {
 <p class="important">If you have a combination of fields that need to be unique (e.g. a compound key), you can specify an array value instead containing all the fields that need to be unique.</p>
 
 
-<h3>Parsed FIelds</h3>
+<h3>Parsed Fields</h3>
 <p>By default, FUEL will not parse the data for <a href="<?=user_guide_url('general/template-parsing')?>">templating syntax</a>. 
   To fix this you add the <dfn>$parsed_fields</dfn> model array property with the array values the names of fields that should be parsed upon retrieval.
   In this example, we'll want the article model's <dfn>content</dfn> field to be parsed so we add the following:
@@ -675,7 +675,7 @@ public function get_thumb_image_path()
 </pre>
 
 <p>If an article with the passed slug value doesn't exist in the table, then it will call the <a href="<?=user_guide_url('helpers/my_url_helper#redirect_404')?>">redirect_404 function</a> which will first look for any <a href="<?=user_guide_url('general/redirects')?>">redirects</a> and if none are
-found, will display the 404 error page. If an article does exist, then it continues down the page and displays the contents of the article by outputing the title, image, author name and content.</p>
+found, will display the 404 error page. If an article does exist, then it continues down the page and displays the contents of the article by outputting the title, image, author name and content.</p>
 
 <p>If no slug value is passed to the page, then a simple <a href="<?=user_guide_url('helpers/fuel_helper#func_fuel_model')?>">fuel_model</a> call will be used which will automatically grab all tags associated with articles.
 We then loop through those tags and because of the <dfn>has_many</dfn> association with the tags module, we are able to easily grab all articles associated with that tag which allows us to create 
diff --git a/fuel/modules/fuel/views/_generate/model/Events_model.php b/fuel/modules/fuel/views/_generate/model/Events_model.php
index abf4ca80c..6d385c4e5 100644
--- a/fuel/modules/fuel/views/_generate/model/Events_model.php
+++ b/fuel/modules/fuel/views/_generate/model/Events_model.php
@@ -9,7 +9,7 @@ class Events_model extends Base_posts_model {
 	public $filters = array(); // filters to apply to when searching for items
 	public $required = array('name');
 	public $foreign_keys = array(); // map foreign keys to table models
-	public $linked_fields = array(); // fields that are linked meaning one value helps to determine another. Key is the field, value is a function name to transform it. (e.g. array('slug' => 'title'), or array('slug' => arry('name' => 'strtolower')));
+	public $linked_fields = array(); // fields that are linked meaning one value helps to determine another. Key is the field, value is a function name to transform it. (e.g. array('slug' => 'title'), or array('slug' => array('name' => 'strtolower')));
 	public $boolean_fields = array(); // fields that are tinyint and should be treated as boolean
 	public $unique_fields = array(); // fields that are not IDs but are unique. Can also be an array of arrays for compound keys
 	public $parsed_fields = array('description', 'description_formatted');
diff --git a/fuel/modules/fuel/views/_generate/model/News_model.php b/fuel/modules/fuel/views/_generate/model/News_model.php
index 2f7755508..8a742b1d6 100644
--- a/fuel/modules/fuel/views/_generate/model/News_model.php
+++ b/fuel/modules/fuel/views/_generate/model/News_model.php
@@ -8,7 +8,7 @@ class News_model extends Base_posts_model {
 	public $filters = array('title', 'content'); // filters to apply to when searching for items
 	public $required = array('title', 'content'); // an array of required fields. If a key => val is provided, the key is name of the field and the value is the error message to display
 	public $foreign_keys = array('category_id' => array(FUEL_FOLDER => 'fuel_categories_model')); // map foreign keys to table models
-	public $linked_fields = array(); // fields that are linked meaning one value helps to determine another. Key is the field, value is a function name to transform it. (e.g. array('slug' => 'title'), or array('slug' => arry('name' => 'strtolower')));
+	public $linked_fields = array(); // fields that are linked meaning one value helps to determine another. Key is the field, value is a function name to transform it. (e.g. array('slug' => 'title'), or array('slug' => array('name' => 'strtolower')));
 	public $boolean_fields = array('featured'); // fields that are tinyint and should be treated as boolean
 	public $unique_fields = array('slug'); // fields that are not IDs but are unique. Can also be an array of arrays for compound keys
 	public $parsed_fields = array('content', 'content_formatted', 'excerpt', 'excerpt_formatted'); // fields to automatically parse
diff --git a/fuel/modules/fuel/views/_generate/model/{Model_name}_model.php b/fuel/modules/fuel/views/_generate/model/{Model_name}_model.php
index c9b77e332..128a57fa2 100644
--- a/fuel/modules/fuel/views/_generate/model/{Model_name}_model.php
+++ b/fuel/modules/fuel/views/_generate/model/{Model_name}_model.php
@@ -10,7 +10,7 @@ class {Model_name}_model extends Base_module_model {
 	public $filters = array(); // filters to apply to when searching for items
 	public $required = array(); // an array of required fields. If a key => val is provided, the key is name of the field and the value is the error message to display
 	public $foreign_keys = array(); // map foreign keys to table models
-	public $linked_fields = array(); // fields that are linked meaning one value helps to determine another. Key is the field, value is a function name to transform it. (e.g. array('slug' => 'title'), or array('slug' => arry('name' => 'strtolower')));
+	public $linked_fields = array(); // fields that are linked meaning one value helps to determine another. Key is the field, value is a function name to transform it. (e.g. array('slug' => 'title'), or array('slug' => array('name' => 'strtolower')));
 	public $boolean_fields = array(); // fields that are tinyint and should be treated as boolean
 	public $unique_fields = array(); // fields that are not IDs but are unique. Can also be an array of arrays for compound keys
 	public $parsed_fields = array(); // fields to automatically parse
diff --git a/fuel/modules/fuel/views/dashboard_ajax.php b/fuel/modules/fuel/views/dashboard_ajax.php
index a7b0efdb9..7ff68b6f9 100644
--- a/fuel/modules/fuel/views/dashboard_ajax.php
+++ b/fuel/modules/fuel/views/dashboard_ajax.php
@@ -35,11 +35,11 @@
 </div>
 <?php endif; ?>
 
-<?php if (!empty($recently_modifed_pages)) : ?>
+<?php if (!empty($recently_modified_pages)) : ?>
 <div class="dashboard_pod" style="width: 230px;">
 	<h3><?=lang('dashboard_hdr_modified')?></h3>
 		<ul class="nobullets">
-			<?php foreach($recently_modifed_pages as $val) : ?>
+			<?php foreach($recently_modified_pages as $val) : ?>
 			<li><a href="<?=fuel_url('pages/edit/'.$val['id'])?>"><?=$val['location']?></a></li>
 			<?php endforeach; ?>
 		</ul>

From fe07a73b5ca008843797a3d76394745e202c4e9b Mon Sep 17 00:00:00 2001
From: David McReynolds <dave@thedaylightstudio.com>
Date: Thu, 23 Aug 2018 08:37:47 -0700
Subject: [PATCH 079/129] Updates to page variables documentation

---
 .../views/_docs/general/pages-variables.php   | 43 +++++++++++--------
 1 file changed, 24 insertions(+), 19 deletions(-)

diff --git a/fuel/modules/fuel/views/_docs/general/pages-variables.php b/fuel/modules/fuel/views/_docs/general/pages-variables.php
index 9245082e0..cee28382e 100644
--- a/fuel/modules/fuel/views/_docs/general/pages-variables.php
+++ b/fuel/modules/fuel/views/_docs/general/pages-variables.php
@@ -1,9 +1,9 @@
 <h1>Pages &amp; Variables</h1>
 <p>FUEL CMS provides several ways for creating pages. To help illustrate, we'll pretend we are creating a simple website. Our website will have the following pages:</p>
 <ul>
-	<li><a href="#static"><strong>about</strong>: static page</a></li>
-	<li><a href="#editable"><strong>about/team</strong>: editable page</a></li>
-	<li><a href="#controller"><strong>about/contact</strong>: controller page</a></li>
+	<li><a href="#static"><strong>home</strong>: static page</a></li>
+	<li><a href="#controller"><strong>contact</strong>: controller page</a></li>
+	<li><a href="#editable"><strong>about</strong>: editable page</a></li>
 	<li><a href="#news"><strong>news</strong>: module page</a></li>
 </ul>
 
@@ -11,22 +11,22 @@
 
 
 <a name="static"></a>
-<h2>Static Page - about</h2>
+<h2>Static Page - home</h2>
 
 <h3>Opt-In Controller Method</h3>
-<p>There are several ways to create a page in FUEL. The easest way is to simply create a view file. We call this method the <a href="<?=user_guide_url('general/opt-in-controllers')?>">Opt-In Controller</a> Method. This allows you to create pages without the need for a controller. A URI path of <strong>about/contact</strong> would have a view file created at <strong>views/about/contact.php</strong>. The method has some extra benefits like having deep path structures and hyphens in the path without the need of routing.</p>
+<p>There are several ways to create a page in FUEL. The easest way is to simply create a view file. We call this method the <a href="<?=user_guide_url('general/opt-in-controllers')?>">Opt-In Controller</a> Method. 
+	This allows you to create pages without the need for a controller. 
+	A URI path of <strong>about/history</strong> would have a view file created at <strong>application/views/about/history.php</strong>. 
+	The method has some extra benefits like having deep path structures and hyphens in the path without the need of routing.
+</p>
 
-<p>For this tutorial we will make the <dfn>about</dfn> page a static view file. To do that, create the following file at <dfn>application/views/about.php</dfn>: </p>
+<p>For this tutorial we will open up the <dfn>application/views/home.php</dfn> view file and replace the contents of that page with the following: </p>
 
 <pre class="brush: xml">
 <h1>Hello World</h1>
-<p>This is our about page</p>
+<p>This is our home page</p>
 </pre>
 
-<p>Note how the <dfn>about</dfn> page should automatically have a header and footer applied to it. This is because the <dfn>application/views/_variables/global.php</dfn> file specifies the <dfn>main</dfn> layout file to be applied to it (more about passing variables below). Layout files exist in the <dfn>application/views/_layouts/</dfn> folder (more about layouts below as well).
-Often times you'll see <dfn>fuel_set_var('body', '');</dfn> in a layout. This is because the variable <dfn>$body</dfn> holds the contents of the view file (in this case the 'about' page).
-</p>
-
 <p class="important">The <kbd>home</kbd> view file is reserved as the index page for the site.</p>
 
 <h3>Passing Variables to a Page</h3>
@@ -64,11 +64,15 @@
 $vars['bigpic'] = 'about_bigpic.jpg';
 </pre>
 
+<p class="important">Note that this page should automatically have a header and footer applied to it when viewed. This is because the <dfn>application/views/_variables/global.php</dfn> 
+	file specifies the <dfn>main</dfn> layout file to be applied to it. Layout files exist in the <dfn>application/views/_layouts/</dfn> folder (more about layouts below as well).
+	Often times you'll see <dfn>fuel_set_var('body', '');</dfn> in a layout. This is because the variable <dfn>$body</dfn> holds the contents of the view file (in this case the 'about' page).
+</p>
 
 
 <a name="controller"></a>
-<h2>Controller Page - about/contact</h2>
-<p>FUEL still allows you to create pages using the standard MVC way in CodeIgniter. For the purposes of this tutorial, we will use a controller for the <dfn>about/contact</dfn> because it has a webform we may want to use for processing. We can also leverage the variables specified in the <dfn>application/views/_variables/</dfn> file like so:</p>
+<h2>Controller Page - contact</h2>
+<p>FUEL still allows you to create pages using the standard MVC way in CodeIgniter. For the purposes of this tutorial, we will use a controller for the <dfn>contact</dfn> because it has a webform we may want to use for processing. We can also leverage the variables specified in the <dfn>application/views/_variables/</dfn> file like so:</p>
 
 <pre class="brush:php">
 class About extends CI_Controller {
@@ -84,20 +88,21 @@ function contact()
 		$vars = array('page_title' => 'Contact : My Website');
 
 		//... form code goes here
-		$this->fuel->pages->render('about/contact', $vars);
+		$this->fuel->pages->render('contact', $vars);
 	}
 }
 </pre>
 
 
 <a name="editable"></a>
-<h2>CMS Page - about/team</h2>
-<p>For the create <dfn>about/team</dfn> page we will login to the CMS by going to 
-<dfn>http://mysite.com/fuel</dfn> (where <strong>mysite.com</strong> is your domain) and entering the username of <dfn>admin</dfn> with the password (which is probably <dfn>admin</dfn> as well if you haven't changed it). Click on the <dfn>Pages</dfn> menu item on the left. For the <dfn>location</dfn> value type in <strong>about/team</strong> and for the <dfn>body</dfn> value, put in the value below, click save and then view the page:</p>
+<h2>CMS Page - about</h2>
+<p>For the <dfn>about</dfn> page we will login to the CMS by going to 
+<dfn>http://mysite.com/fuel</dfn> (where <strong>mysite.com</strong> is your domain) and entering the username of <dfn>admin</dfn> with the password (which is probably <dfn>admin</dfn> as well if you haven't changed it). 
+Click on the <dfn>Pages</dfn> menu item on the left. For the <dfn>location</dfn> value type in <strong>about</strong> and for the <dfn>body</dfn> value, put in the value below, click save and then view the page:</p>
 
 <pre class="brush: php">
-<h1>Team</h1>
-<p>This is our team page</p>
+<h1>About</h1>
+<p>This is our about page</p>
 </pre>
 
 <a name="news"></a>

From a7ded703196074df907dea74147411c7cfd5432e Mon Sep 17 00:00:00 2001
From: David McReynolds <dave@thedaylightstudio.com>
Date: Thu, 23 Aug 2018 08:38:13 -0700
Subject: [PATCH 080/129] Added ability to have multiple like conditions for
 embedded list query

---
 .../modules/fuel/models/Base_module_model.php | 26 ++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/fuel/modules/fuel/models/Base_module_model.php b/fuel/modules/fuel/models/Base_module_model.php
index 23c1d1d89..29b0c169d 100644
--- a/fuel/modules/fuel/models/Base_module_model.php
+++ b/fuel/modules/fuel/models/Base_module_model.php
@@ -1199,9 +1199,29 @@ public function get_embedded_list_items($params, $list_cols = array(), $actions
 
 		if (!empty($params['like']))
 		{
-			$key = key($params['like']);
-			$val = current($params['like']);
-			$this->db->like($key, $val, 'both');
+			$this->db->group_start();
+			if (is_array($params['like']))
+			{
+				foreach($params['like'] as $k => $v)
+				{
+					unset($params['like'][$k]);
+					$k = str_replace(':', '.', $k);
+					if (is_string($v))
+					{
+						$params['like'][$k] = str_replace(':', '.', $v);
+					}
+
+					$this->db->or_like($k, $v, 'both');
+				}
+			}
+			else
+			{
+				$key = key($params['like']);
+				$val = current($params['like']);
+				$this->db->like($key, $val, 'both');
+			}
+
+			$this->db->group_end();
 		}
 		
 		$list_items = $this->list_items();

From 92f861af62e42e798b0cb485e4ab30e21c3eeace Mon Sep 17 00:00:00 2001
From: David McReynolds <dave@thedaylightstudio.com>
Date: Thu, 23 Aug 2018 09:02:19 -0700
Subject: [PATCH 081/129] Fix to use optimized assets again

---
 fuel/modules/fuel/assets/js/fuel/fuel.min.js | 894 +++++++++----------
 fuel/modules/fuel/config/fuel.php            |   6 +-
 fuel/modules/fuel/libraries/Asset.php        |  10 +-
 3 files changed, 451 insertions(+), 459 deletions(-)

diff --git a/fuel/modules/fuel/assets/js/fuel/fuel.min.js b/fuel/modules/fuel/assets/js/fuel/fuel.min.js
index 1acffa39e..5a451008c 100644
--- a/fuel/modules/fuel/assets/js/fuel/fuel.min.js
+++ b/fuel/modules/fuel/assets/js/fuel/fuel.min.js
@@ -683,15 +683,15 @@ helper.parent.unfixPNG();
 }
 $.fn.Tooltip = $.fn.tooltip;
 })(jQuery);
-/**
-* jQuery.ScrollTo - Easy element scrolling using jQuery.
-* Copyright (c) 2008 Ariel Flesler - aflesler(at)gmail(dot)com | http://flesler.blogspot.com
-* Dual licensed under the MIT (http://www.opensource.org/licenses/mit-license.php)
-* and GPL (http://www.opensource.org/licenses/gpl-license.php) licenses.
-* Date: 2/19/2008
-* @author Ariel Flesler
-* @version 1.3.3
-*/
+/**
+* jQuery.ScrollTo - Easy element scrolling using jQuery.
+* Copyright (c) 2008 Ariel Flesler - aflesler(at)gmail(dot)com | http://flesler.blogspot.com
+* Dual licensed under the MIT (http://www.opensource.org/licenses/mit-license.php)
+* and GPL (http://www.opensource.org/licenses/gpl-license.php) licenses.
+* Date: 2/19/2008
+* @author Ariel Flesler
+* @version 1.3.3
+*/
 ;(function($){var o=$.scrollTo=function(a,b,c){o.window().scrollTo(a,b,c)};o.defaults={axis:'y',duration:1};o.window=function(){return $($.browser.safari?'body':'html')};$.fn.scrollTo=function(l,m,n){if(typeof m=='object'){n=m;m=0}n=$.extend({},o.defaults,n);m=m||n.speed||n.duration;n.queue=n.queue&&n.axis.length>1;if(n.queue)m/=2;n.offset=j(n.offset);n.over=j(n.over);return this.each(function(){var a=this,b=$(a),t=l,c,d={},w=b.is('html,body');switch(typeof t){case'number':case'string':if(/^([+-]=)?\d+(px)?$/.test(t)){t=j(t);break}t=$(t,this);case'object':if(t.is||t.style)c=(t=$(t)).offset()}$.each(n.axis.split(''),function(i,f){var P=f=='x'?'Left':'Top',p=P.toLowerCase(),k='scroll'+P,e=a[k],D=f=='x'?'Width':'Height';if(c){d[k]=c[p]+(w?0:e-b.offset()[p]);if(n.margin){d[k]-=parseInt(t.css('margin'+P))||0;d[k]-=parseInt(t.css('border'+P+'Width'))||0}d[k]+=n.offset[p]||0;if(n.over[p])d[k]+=t[D.toLowerCase()]()*n.over[p]}else d[k]=t[p];if(/^\d+$/.test(d[k]))d[k]=d[k]<=0?0:Math.min(d[k],h(D));if(!i&&n.queue){if(e!=d[k])g(n.onAfterFirst);delete d[k]}});g(n.onAfter);function g(a){b.animate(d,m,n.easing,a&&function(){a.call(this,l)})};function h(D){var b=w?$.browser.opera?document.body:document.documentElement:a;return b['scroll'+D]-b['client'+D]}})};function j(a){return typeof a=='object'?a:{top:a,left:a}}})(jQuery);
 /*
 * jqModal - Minimalist Modaling with jQuery
@@ -3265,444 +3265,444 @@ direction: 'asc'
 return this;
 };
 })(jQuery);
-/*
-### jQuery Multiple File Upload Plugin v1.47 - 2010-03-26 ###
-* Home: http://www.fyneworks.com/jquery/multiple-file-upload/
-* Code: http://code.google.com/p/jquery-multifile-plugin/
-*
-* Dual licensed under the MIT and GPL licenses:
-*   http://www.opensource.org/licenses/mit-license.php
-*   http://www.gnu.org/licenses/gpl.html
-###
-*/
-/*# AVOID COLLISIONS #*/
-;if(window.jQuery) (function($){
-/*# AVOID COLLISIONS #*/
-// plugin initialization
-$.fn.MultiFile = function(options){
-if(this.length==0) return this; // quick fail
-// Handle API methods
-if(typeof arguments[0]=='string'){
-// Perform API methods on individual elements
-if(this.length>1){
-var args = arguments;
-return this.each(function(){
-$.fn.MultiFile.apply($(this), args);
-});
-};
-// Invoke API method handler
-$.fn.MultiFile[arguments[0]].apply(this, $.makeArray(arguments).slice(1) || []);
-// Quick exit...
-return this;
-};
-// Initialize options for this call
-var options = $.extend(
-{}/* new object */,
-$.fn.MultiFile.options/* default options */,
-options || {} /* just-in-time options */
-);
-// Empty Element Fix!!!
-// this code will automatically intercept native form submissions
-// and disable empty file elements
-$('form')
-.not('MultiFile-intercepted')
-.addClass('MultiFile-intercepted')
-.submit($.fn.MultiFile.disableEmpty);
-//### http://plugins.jquery.com/node/1363
-// utility method to integrate this plugin with others...
-if($.fn.MultiFile.options.autoIntercept){
-$.fn.MultiFile.intercept( $.fn.MultiFile.options.autoIntercept /* array of methods to intercept */ );
-$.fn.MultiFile.options.autoIntercept = null; /* only run this once */
-};
-// loop through each matched element
-this
-.not('.MultiFile-applied')
-.addClass('MultiFile-applied')
-.each(function(){
-//#####################################################################
-// MAIN PLUGIN FUNCTIONALITY - START
-//#####################################################################
-// BUG 1251 FIX: http://plugins.jquery.com/project/comments/add/1251
-// variable group_count would repeat itself on multiple calls to the plugin.
-// this would cause a conflict with multiple elements
-// changes scope of variable to global so id will be unique over n calls
-window.MultiFile = (window.MultiFile || 0) + 1;
-var group_count = window.MultiFile;
-// Copy parent attributes - Thanks to Jonas Wagner
-// we will use this one to create new input elements
-var MultiFile = {e:this, E:$(this), clone:$(this).clone()};
-//===
-//# USE CONFIGURATION
-if(typeof options=='number') options = {max:options};
-var o = $.extend({},
-$.fn.MultiFile.options,
-options || {},
-($.metadata? MultiFile.E.metadata(): ($.meta?MultiFile.E.data():null)) || {}, /* metadata options */
-{} /* internals */
-);
-// limit number of files that can be selected?
-if(!(o.max>0) /*IsNull(MultiFile.max)*/){
-o.max = MultiFile.E.attr('maxlength');
-if(!(o.max>0) /*IsNull(MultiFile.max)*/){
-o.max = (String(MultiFile.e.className.match(/\b(max|limit)\-([0-9]+)\b/gi) || ['']).match(/[0-9]+/gi) || [''])[0];
-if(!(o.max>0)) o.max = -1;
-else           o.max = String(o.max).match(/[0-9]+/gi)[0];
-}
-};
-o.max = new Number(o.max);
-// limit extensions?
-o.accept = o.accept || MultiFile.E.attr('accept') || '';
-if(!o.accept){
-o.accept = (MultiFile.e.className.match(/\b(accept\-[\w\|]+)\b/gi)) || '';
-o.accept = new String(o.accept).replace(/^(accept|ext)\-/i,'');
-};
-//===
-// APPLY CONFIGURATION
-$.extend(MultiFile, o || {});
-MultiFile.STRING = $.extend({},$.fn.MultiFile.options.STRING,MultiFile.STRING);
-//===
-//#########################################
-// PRIVATE PROPERTIES/METHODS
-$.extend(MultiFile, {
-n: 0, // How many elements are currently selected?
-slaves: [], files: [],
-instanceKey: MultiFile.e.id || 'MultiFile'+String(group_count), // Instance Key?
-generateID: function(z){ return MultiFile.instanceKey + (z>0 ?'_F'+String(z):''); },
-trigger: function(event, element){
-var handler = MultiFile[event], value = $(element).attr('value');
-if(handler){
-var returnValue = handler(element, value, MultiFile);
-if( returnValue!=null ) return returnValue;
-}
-return true;
-}
-});
-//===
-// Setup dynamic regular expression for extension validation
-// - thanks to John-Paul Bader: http://smyck.de/2006/08/11/javascript-dynamic-regular-expresions/
-if(String(MultiFile.accept).length>1){
-MultiFile.accept = MultiFile.accept.replace(/\W+/g,'|').replace(/^\W|\W$/g,'');
-MultiFile.rxAccept = new RegExp('\\.('+(MultiFile.accept?MultiFile.accept:'')+')$','gi');
-};
-//===
-// Create wrapper to hold our file list
-MultiFile.wrapID = MultiFile.instanceKey+'_wrap'; // Wrapper ID?
-MultiFile.E.wrap('<div class="MultiFile-wrap" id="'+MultiFile.wrapID+'"></div>');
-MultiFile.wrapper = $('#'+MultiFile.wrapID+'');
-//===
-// MultiFile MUST have a name - default: file1[], file2[], file3[]
-MultiFile.e.name = MultiFile.e.name || 'file'+ group_count +'[]';
-//===
-if(!MultiFile.list){
-// Create a wrapper for the list
-// * OPERA BUG: NO_MODIFICATION_ALLOWED_ERR ('list' is a read-only property)
-// this change allows us to keep the files in the order they were selected
-MultiFile.wrapper.append( '<div class="MultiFile-list" id="'+MultiFile.wrapID+'_list"></div>' );
-MultiFile.list = $('#'+MultiFile.wrapID+'_list');
-};
-MultiFile.list = $(MultiFile.list);
-//===
-// Bind a new element
-MultiFile.addSlave = function( slave, slave_count ){
-//if(window.console) console.log('MultiFile.addSlave',slave_count);
-// Keep track of how many elements have been displayed
-MultiFile.n++;
-// Add reference to master element
-slave.MultiFile = MultiFile;
-// BUG FIX: http://plugins.jquery.com/node/1495
-// Clear identifying properties from clones
-if(slave_count>0) slave.id = slave.name = '';
-// Define element's ID and name (upload components need this!)
-//slave.id = slave.id || MultiFile.generateID(slave_count);
-if(slave_count>0) slave.id = MultiFile.generateID(slave_count);
-//FIX for: http://code.google.com/p/jquery-multifile-plugin/issues/detail?id=23
-// 2008-Apr-29: New customizable naming convention (see url below)
-// http://groups.google.com/group/jquery-dev/browse_frm/thread/765c73e41b34f924#
-slave.name = String(MultiFile.namePattern
-/*master name*/.replace(/\$name/gi,$(MultiFile.clone).attr('name'))
-/*master id  */.replace(/\$id/gi,  $(MultiFile.clone).attr('id'))
-/*group count*/.replace(/\$g/gi,   group_count)//(group_count>0?group_count:''))
-/*slave count*/.replace(/\$i/gi,   slave_count)//(slave_count>0?slave_count:''))
-);
-// If we've reached maximum number, disable input slave
-if( (MultiFile.max > 0) && ((MultiFile.n-1) > (MultiFile.max)) )//{ // MultiFile.n Starts at 1, so subtract 1 to find true count
-slave.disabled = true;
-//};
-// Remember most recent slave
-MultiFile.current = MultiFile.slaves[slave_count] = slave;
-// We'll use jQuery from now on
-slave = $(slave);
-// Clear value
-slave.val('').attr('value','')[0].value = '';
-// Stop plugin initializing on slaves
-slave.addClass('MultiFile-applied');
-// Triggered when a file is selected
-slave.change(function(){
-//if(window.console) console.log('MultiFile.slave.change',slave_count);
-// Lose focus to stop IE7 firing onchange again
-$(this).blur();
-//# Trigger Event! onFileSelect
-if(!MultiFile.trigger('onFileSelect', this, MultiFile)) return false;
-//# End Event!
-//# Retrive value of selected file from element
-var ERROR = '', v = String(this.value || ''/*.attr('value)*/);
-// check extension
-if(MultiFile.accept && v && !v.match(MultiFile.rxAccept))//{
-ERROR = MultiFile.STRING.denied.replace('$ext', String(v.match(/\.\w{1,4}$/gi)));
-//}
-//};
-// Disallow duplicates
-for(var f in MultiFile.slaves)//{
-if(MultiFile.slaves[f] && MultiFile.slaves[f]!=this)//{
-//console.log(MultiFile.slaves[f],MultiFile.slaves[f].value);
-if(MultiFile.slaves[f].value==v)//{
-ERROR = MultiFile.STRING.duplicate.replace('$file', v.match(/[^\/\\]+$/gi));
-//};
-//};
-//};
-// Create a new file input element
-var newEle = $(MultiFile.clone).clone();// Copy parent attributes - Thanks to Jonas Wagner
-//# Let's remember which input we've generated so
-// we can disable the empty ones before submission
-// See: http://plugins.jquery.com/node/1495
-newEle.addClass('MultiFile');
-// Handle error
-if(ERROR!=''){
-// Handle error
-MultiFile.error(ERROR);
-// 2007-06-24: BUG FIX - Thanks to Adrian Wróbel <adrian [dot] wrobel [at] gmail.com>
-// Ditch the trouble maker and add a fresh new element
-MultiFile.n--;
-MultiFile.addSlave(newEle[0], slave_count);
-slave.parent().prepend(newEle);
-slave.remove();
-return false;
-};
-// Hide this element (NB: display:none is evil!)
-$(this).css({ position:'absolute', top: '-3000px' });
-// Add new element to the form
-slave.after(newEle);
-// Update list
-MultiFile.addToList( this, slave_count );
-// Bind functionality
-MultiFile.addSlave( newEle[0], slave_count+1 );
-//# Trigger Event! afterFileSelect
-if(!MultiFile.trigger('afterFileSelect', this, MultiFile)) return false;
-//# End Event!
-}); // slave.change()
-// Save control to element
-$(slave).data('MultiFile', MultiFile);
-};// MultiFile.addSlave
-// Bind a new element
-// Add a new file to the list
-MultiFile.addToList = function( slave, slave_count ){
-//if(window.console) console.log('MultiFile.addToList',slave_count);
-//# Trigger Event! onFileAppend
-if(!MultiFile.trigger('onFileAppend', slave, MultiFile)) return false;
-//# End Event!
-// Create label elements
-var
-r = $('<div class="MultiFile-label"></div>'),
-v = String(slave.value || ''/*.attr('value)*/),
-a = $('<span class="MultiFile-title" title="'+MultiFile.STRING.selected.replace('$file', v)+'">'+MultiFile.STRING.file.replace('$file', v.match(/[^\/\\]+$/gi)[0])+'</span>'),
-b = $('<a class="MultiFile-remove" href="#'+MultiFile.wrapID+'">'+MultiFile.STRING.remove+'</a>');
-// Insert label
-MultiFile.list.append(
-r.append(b, ' ', a)
-);
-b
-.click(function(){
-//# Trigger Event! onFileRemove
-if(!MultiFile.trigger('onFileRemove', slave, MultiFile)) return false;
-//# End Event!
-MultiFile.n--;
-MultiFile.current.disabled = false;
-// Remove element, remove label, point to current
-MultiFile.slaves[slave_count] = null;
-$(slave).remove();
-$(this).parent().remove();
-// Show most current element again (move into view) and clear selection
-$(MultiFile.current).css({ position:'', top: '' });
-$(MultiFile.current).reset().val('').attr('value', '')[0].value = '';
-//# Trigger Event! afterFileRemove
-if(!MultiFile.trigger('afterFileRemove', slave, MultiFile)) return false;
-//# End Event!
-return false;
-});
-//# Trigger Event! afterFileAppend
-if(!MultiFile.trigger('afterFileAppend', slave, MultiFile)) return false;
-//# End Event!
-}; // MultiFile.addToList
-// Add element to selected files list
-// Bind functionality to the first element
-if(!MultiFile.MultiFile) MultiFile.addSlave(MultiFile.e, 0);
-// Increment control count
-//MultiFile.I++; // using window.MultiFile
-MultiFile.n++;
-// Save control to element
-MultiFile.E.data('MultiFile', MultiFile);
-//#####################################################################
-// MAIN PLUGIN FUNCTIONALITY - END
-//#####################################################################
-}); // each element
-};
-/*--------------------------------------------------------*/
-/*
-### Core functionality and API ###
-*/
-$.extend($.fn.MultiFile, {
-/**
-* This method removes all selected files
-*
-* Returns a jQuery collection of all affected elements.
-*
-* @name reset
-* @type jQuery
-* @cat Plugins/MultiFile
-* @author Diego A. (http://www.fyneworks.com/)
-*
-* @example $.fn.MultiFile.reset();
-*/
-reset: function(){
-var settings = $(this).data('MultiFile');
-//if(settings) settings.wrapper.find('a.MultiFile-remove').click();
-if(settings) settings.list.find('a.MultiFile-remove').click();
-return $(this);
-},
-/**
-* This utility makes it easy to disable all 'empty' file elements in the document before submitting a form.
-* It marks the affected elements so they can be easily re-enabled after the form submission or validation.
-*
-* Returns a jQuery collection of all affected elements.
-*
-* @name disableEmpty
-* @type jQuery
-* @cat Plugins/MultiFile
-* @author Diego A. (http://www.fyneworks.com/)
-*
-* @example $.fn.MultiFile.disableEmpty();
-* @param String class (optional) A string specifying a class to be applied to all affected elements - Default: 'mfD'.
-*/
-disableEmpty: function(klass){ klass = (typeof(klass)=='string'?klass:'')||'mfD';
-var o = [];
-$('input:file.MultiFile').each(function(){ if($(this).val()=='') o[o.length] = this; });
-return $(o).each(function(){ this.disabled = true }).addClass(klass);
-},
-/**
-* This method re-enables 'empty' file elements that were disabled (and marked) with the $.fn.MultiFile.disableEmpty method.
-*
-* Returns a jQuery collection of all affected elements.
-*
-* @name reEnableEmpty
-* @type jQuery
-* @cat Plugins/MultiFile
-* @author Diego A. (http://www.fyneworks.com/)
-*
-* @example $.fn.MultiFile.reEnableEmpty();
-* @param String klass (optional) A string specifying the class that was used to mark affected elements - Default: 'mfD'.
-*/
-reEnableEmpty: function(klass){ klass = (typeof(klass)=='string'?klass:'')||'mfD';
-return $('input:file.'+klass).removeClass(klass).each(function(){ this.disabled = false });
-},
-/**
-* This method will intercept other jQuery plugins and disable empty file input elements prior to form submission
-*
-* @name intercept
-* @cat Plugins/MultiFile
-* @author Diego A. (http://www.fyneworks.com/)
-*
-* @example $.fn.MultiFile.intercept();
-* @param Array methods (optional) Array of method names to be intercepted
-*/
-intercepted: {},
-intercept: function(methods, context, args){
-var method, value; args = args || [];
-if(args.constructor.toString().indexOf("Array")<0) args = [ args ];
-if(typeof(methods)=='function'){
-$.fn.MultiFile.disableEmpty();
-value = methods.apply(context || window, args);
-//SEE-http://code.google.com/p/jquery-multifile-plugin/issues/detail?id=27
-setTimeout(function(){ $.fn.MultiFile.reEnableEmpty() },1000);
-return value;
-};
-if(methods.constructor.toString().indexOf("Array")<0) methods = [methods];
-for(var i=0;i<methods.length;i++){
-method = methods[i]+''; // make sure that we have a STRING
-if(method) (function(method){ // make sure that method is ISOLATED for the interception
-$.fn.MultiFile.intercepted[method] = $.fn[method] || function(){};
-$.fn[method] = function(){
-$.fn.MultiFile.disableEmpty();
-value = $.fn.MultiFile.intercepted[method].apply(this, arguments);
-//SEE-http://code.google.com/p/jquery-multifile-plugin/issues/detail?id=27
-setTimeout(function(){ $.fn.MultiFile.reEnableEmpty() },1000);
-return value;
-}; // interception
-})(method); // MAKE SURE THAT method IS ISOLATED for the interception
-};// for each method
-} // $.fn.MultiFile.intercept
-});
-/*--------------------------------------------------------*/
-/*
-### Default Settings ###
-eg.: You can override default control like this:
-$.fn.MultiFile.options.accept = 'gif|jpg';
-*/
-$.fn.MultiFile.options = { //$.extend($.fn.MultiFile, { options: {
-accept: '', // accepted file extensions
-max: -1,    // maximum number of selectable files
-// name to use for newly created elements
-namePattern: '$name', // same name by default (which creates an array)
-// STRING: collection lets you show messages in different languages
-STRING: {
-remove:'x',
-denied:'You cannot select a $ext file.\nTry again...',
-file:'$file',
-selected:'File selected: $file',
-duplicate:'This file has already been selected:\n$file'
-},
-// name of methods that should be automcatically intercepted so the plugin can disable
-// extra file elements that are empty before execution and automatically re-enable them afterwards
-autoIntercept: [ 'submit', 'ajaxSubmit', 'ajaxForm', 'validate', 'valid' /* array of methods to intercept */ ],
-// error handling function
-error: function(s){
-/*
-ERROR! blockUI is not currently working in IE
-if($.blockUI){
-$.blockUI({
-message: s.replace(/\n/gi,'<br/>'),
-css: { 
-border:'none', padding:'15px', size:'12.0pt',
-backgroundColor:'#900', color:'#fff',
-opacity:'.8','-webkit-border-radius': '10px','-moz-border-radius': '10px'
-}
-});
-window.setTimeout($.unblockUI, 2000);
-}
-else//{// save a byte!
-*/
-alert(s);
-//}// save a byte!
-}
-}; //} });
-/*--------------------------------------------------------*/
-/*
-### Additional Methods ###
-Required functionality outside the plugin's scope
-*/
-// Native input reset method - because this alone doesn't always work: $(element).val('').attr('value', '')[0].value = '';
-$.fn.reset = function(){ return this.each(function(){ try{ this.reset(); }catch(e){} }); };
-/*--------------------------------------------------------*/
-/*
-### Default implementation ###
-The plugin will attach itself to file inputs
-with the class 'multi' when the page loads
-*/
-$(function(){
-//$("input:file.multi").MultiFile();
-$("input[type=file].multi").MultiFile();
-});
-/*# AVOID COLLISIONS #*/
-})(jQuery);
+/*
+### jQuery Multiple File Upload Plugin v1.47 - 2010-03-26 ###
+* Home: http://www.fyneworks.com/jquery/multiple-file-upload/
+* Code: http://code.google.com/p/jquery-multifile-plugin/
+*
+* Dual licensed under the MIT and GPL licenses:
+*   http://www.opensource.org/licenses/mit-license.php
+*   http://www.gnu.org/licenses/gpl.html
+###
+*/
+/*# AVOID COLLISIONS #*/
+;if(window.jQuery) (function($){
+/*# AVOID COLLISIONS #*/
+// plugin initialization
+$.fn.MultiFile = function(options){
+if(this.length==0) return this; // quick fail
+// Handle API methods
+if(typeof arguments[0]=='string'){
+// Perform API methods on individual elements
+if(this.length>1){
+var args = arguments;
+return this.each(function(){
+$.fn.MultiFile.apply($(this), args);
+});
+};
+// Invoke API method handler
+$.fn.MultiFile[arguments[0]].apply(this, $.makeArray(arguments).slice(1) || []);
+// Quick exit...
+return this;
+};
+// Initialize options for this call
+var options = $.extend(
+{}/* new object */,
+$.fn.MultiFile.options/* default options */,
+options || {} /* just-in-time options */
+);
+// Empty Element Fix!!!
+// this code will automatically intercept native form submissions
+// and disable empty file elements
+$('form')
+.not('MultiFile-intercepted')
+.addClass('MultiFile-intercepted')
+.submit($.fn.MultiFile.disableEmpty);
+//### http://plugins.jquery.com/node/1363
+// utility method to integrate this plugin with others...
+if($.fn.MultiFile.options.autoIntercept){
+$.fn.MultiFile.intercept( $.fn.MultiFile.options.autoIntercept /* array of methods to intercept */ );
+$.fn.MultiFile.options.autoIntercept = null; /* only run this once */
+};
+// loop through each matched element
+this
+.not('.MultiFile-applied')
+.addClass('MultiFile-applied')
+.each(function(){
+//#####################################################################
+// MAIN PLUGIN FUNCTIONALITY - START
+//#####################################################################
+// BUG 1251 FIX: http://plugins.jquery.com/project/comments/add/1251
+// variable group_count would repeat itself on multiple calls to the plugin.
+// this would cause a conflict with multiple elements
+// changes scope of variable to global so id will be unique over n calls
+window.MultiFile = (window.MultiFile || 0) + 1;
+var group_count = window.MultiFile;
+// Copy parent attributes - Thanks to Jonas Wagner
+// we will use this one to create new input elements
+var MultiFile = {e:this, E:$(this), clone:$(this).clone()};
+//===
+//# USE CONFIGURATION
+if(typeof options=='number') options = {max:options};
+var o = $.extend({},
+$.fn.MultiFile.options,
+options || {},
+($.metadata? MultiFile.E.metadata(): ($.meta?MultiFile.E.data():null)) || {}, /* metadata options */
+{} /* internals */
+);
+// limit number of files that can be selected?
+if(!(o.max>0) /*IsNull(MultiFile.max)*/){
+o.max = MultiFile.E.attr('maxlength');
+if(!(o.max>0) /*IsNull(MultiFile.max)*/){
+o.max = (String(MultiFile.e.className.match(/\b(max|limit)\-([0-9]+)\b/gi) || ['']).match(/[0-9]+/gi) || [''])[0];
+if(!(o.max>0)) o.max = -1;
+else           o.max = String(o.max).match(/[0-9]+/gi)[0];
+}
+};
+o.max = new Number(o.max);
+// limit extensions?
+o.accept = o.accept || MultiFile.E.attr('accept') || '';
+if(!o.accept){
+o.accept = (MultiFile.e.className.match(/\b(accept\-[\w\|]+)\b/gi)) || '';
+o.accept = new String(o.accept).replace(/^(accept|ext)\-/i,'');
+};
+//===
+// APPLY CONFIGURATION
+$.extend(MultiFile, o || {});
+MultiFile.STRING = $.extend({},$.fn.MultiFile.options.STRING,MultiFile.STRING);
+//===
+//#########################################
+// PRIVATE PROPERTIES/METHODS
+$.extend(MultiFile, {
+n: 0, // How many elements are currently selected?
+slaves: [], files: [],
+instanceKey: MultiFile.e.id || 'MultiFile'+String(group_count), // Instance Key?
+generateID: function(z){ return MultiFile.instanceKey + (z>0 ?'_F'+String(z):''); },
+trigger: function(event, element){
+var handler = MultiFile[event], value = $(element).attr('value');
+if(handler){
+var returnValue = handler(element, value, MultiFile);
+if( returnValue!=null ) return returnValue;
+}
+return true;
+}
+});
+//===
+// Setup dynamic regular expression for extension validation
+// - thanks to John-Paul Bader: http://smyck.de/2006/08/11/javascript-dynamic-regular-expresions/
+if(String(MultiFile.accept).length>1){
+MultiFile.accept = MultiFile.accept.replace(/\W+/g,'|').replace(/^\W|\W$/g,'');
+MultiFile.rxAccept = new RegExp('\\.('+(MultiFile.accept?MultiFile.accept:'')+')$','gi');
+};
+//===
+// Create wrapper to hold our file list
+MultiFile.wrapID = MultiFile.instanceKey+'_wrap'; // Wrapper ID?
+MultiFile.E.wrap('<div class="MultiFile-wrap" id="'+MultiFile.wrapID+'"></div>');
+MultiFile.wrapper = $('#'+MultiFile.wrapID+'');
+//===
+// MultiFile MUST have a name - default: file1[], file2[], file3[]
+MultiFile.e.name = MultiFile.e.name || 'file'+ group_count +'[]';
+//===
+if(!MultiFile.list){
+// Create a wrapper for the list
+// * OPERA BUG: NO_MODIFICATION_ALLOWED_ERR ('list' is a read-only property)
+// this change allows us to keep the files in the order they were selected
+MultiFile.wrapper.append( '<div class="MultiFile-list" id="'+MultiFile.wrapID+'_list"></div>' );
+MultiFile.list = $('#'+MultiFile.wrapID+'_list');
+};
+MultiFile.list = $(MultiFile.list);
+//===
+// Bind a new element
+MultiFile.addSlave = function( slave, slave_count ){
+//if(window.console) console.log('MultiFile.addSlave',slave_count);
+// Keep track of how many elements have been displayed
+MultiFile.n++;
+// Add reference to master element
+slave.MultiFile = MultiFile;
+// BUG FIX: http://plugins.jquery.com/node/1495
+// Clear identifying properties from clones
+if(slave_count>0) slave.id = slave.name = '';
+// Define element's ID and name (upload components need this!)
+//slave.id = slave.id || MultiFile.generateID(slave_count);
+if(slave_count>0) slave.id = MultiFile.generateID(slave_count);
+//FIX for: http://code.google.com/p/jquery-multifile-plugin/issues/detail?id=23
+// 2008-Apr-29: New customizable naming convention (see url below)
+// http://groups.google.com/group/jquery-dev/browse_frm/thread/765c73e41b34f924#
+slave.name = String(MultiFile.namePattern
+/*master name*/.replace(/\$name/gi,$(MultiFile.clone).attr('name'))
+/*master id  */.replace(/\$id/gi,  $(MultiFile.clone).attr('id'))
+/*group count*/.replace(/\$g/gi,   group_count)//(group_count>0?group_count:''))
+/*slave count*/.replace(/\$i/gi,   slave_count)//(slave_count>0?slave_count:''))
+);
+// If we've reached maximum number, disable input slave
+if( (MultiFile.max > 0) && ((MultiFile.n-1) > (MultiFile.max)) )//{ // MultiFile.n Starts at 1, so subtract 1 to find true count
+slave.disabled = true;
+//};
+// Remember most recent slave
+MultiFile.current = MultiFile.slaves[slave_count] = slave;
+// We'll use jQuery from now on
+slave = $(slave);
+// Clear value
+slave.val('').attr('value','')[0].value = '';
+// Stop plugin initializing on slaves
+slave.addClass('MultiFile-applied');
+// Triggered when a file is selected
+slave.change(function(){
+//if(window.console) console.log('MultiFile.slave.change',slave_count);
+// Lose focus to stop IE7 firing onchange again
+$(this).blur();
+//# Trigger Event! onFileSelect
+if(!MultiFile.trigger('onFileSelect', this, MultiFile)) return false;
+//# End Event!
+//# Retrive value of selected file from element
+var ERROR = '', v = String(this.value || ''/*.attr('value)*/);
+// check extension
+if(MultiFile.accept && v && !v.match(MultiFile.rxAccept))//{
+ERROR = MultiFile.STRING.denied.replace('$ext', String(v.match(/\.\w{1,4}$/gi)));
+//}
+//};
+// Disallow duplicates
+for(var f in MultiFile.slaves)//{
+if(MultiFile.slaves[f] && MultiFile.slaves[f]!=this)//{
+//console.log(MultiFile.slaves[f],MultiFile.slaves[f].value);
+if(MultiFile.slaves[f].value==v)//{
+ERROR = MultiFile.STRING.duplicate.replace('$file', v.match(/[^\/\\]+$/gi));
+//};
+//};
+//};
+// Create a new file input element
+var newEle = $(MultiFile.clone).clone();// Copy parent attributes - Thanks to Jonas Wagner
+//# Let's remember which input we've generated so
+// we can disable the empty ones before submission
+// See: http://plugins.jquery.com/node/1495
+newEle.addClass('MultiFile');
+// Handle error
+if(ERROR!=''){
+// Handle error
+MultiFile.error(ERROR);
+// 2007-06-24: BUG FIX - Thanks to Adrian Wróbel <adrian [dot] wrobel [at] gmail.com>
+// Ditch the trouble maker and add a fresh new element
+MultiFile.n--;
+MultiFile.addSlave(newEle[0], slave_count);
+slave.parent().prepend(newEle);
+slave.remove();
+return false;
+};
+// Hide this element (NB: display:none is evil!)
+$(this).css({ position:'absolute', top: '-3000px' });
+// Add new element to the form
+slave.after(newEle);
+// Update list
+MultiFile.addToList( this, slave_count );
+// Bind functionality
+MultiFile.addSlave( newEle[0], slave_count+1 );
+//# Trigger Event! afterFileSelect
+if(!MultiFile.trigger('afterFileSelect', this, MultiFile)) return false;
+//# End Event!
+}); // slave.change()
+// Save control to element
+$(slave).data('MultiFile', MultiFile);
+};// MultiFile.addSlave
+// Bind a new element
+// Add a new file to the list
+MultiFile.addToList = function( slave, slave_count ){
+//if(window.console) console.log('MultiFile.addToList',slave_count);
+//# Trigger Event! onFileAppend
+if(!MultiFile.trigger('onFileAppend', slave, MultiFile)) return false;
+//# End Event!
+// Create label elements
+var
+r = $('<div class="MultiFile-label"></div>'),
+v = String(slave.value || ''/*.attr('value)*/),
+a = $('<span class="MultiFile-title" title="'+MultiFile.STRING.selected.replace('$file', v)+'">'+MultiFile.STRING.file.replace('$file', v.match(/[^\/\\]+$/gi)[0])+'</span>'),
+b = $('<a class="MultiFile-remove" href="#'+MultiFile.wrapID+'">'+MultiFile.STRING.remove+'</a>');
+// Insert label
+MultiFile.list.append(
+r.append(b, ' ', a)
+);
+b
+.click(function(){
+//# Trigger Event! onFileRemove
+if(!MultiFile.trigger('onFileRemove', slave, MultiFile)) return false;
+//# End Event!
+MultiFile.n--;
+MultiFile.current.disabled = false;
+// Remove element, remove label, point to current
+MultiFile.slaves[slave_count] = null;
+$(slave).remove();
+$(this).parent().remove();
+// Show most current element again (move into view) and clear selection
+$(MultiFile.current).css({ position:'', top: '' });
+$(MultiFile.current).reset().val('').attr('value', '')[0].value = '';
+//# Trigger Event! afterFileRemove
+if(!MultiFile.trigger('afterFileRemove', slave, MultiFile)) return false;
+//# End Event!
+return false;
+});
+//# Trigger Event! afterFileAppend
+if(!MultiFile.trigger('afterFileAppend', slave, MultiFile)) return false;
+//# End Event!
+}; // MultiFile.addToList
+// Add element to selected files list
+// Bind functionality to the first element
+if(!MultiFile.MultiFile) MultiFile.addSlave(MultiFile.e, 0);
+// Increment control count
+//MultiFile.I++; // using window.MultiFile
+MultiFile.n++;
+// Save control to element
+MultiFile.E.data('MultiFile', MultiFile);
+//#####################################################################
+// MAIN PLUGIN FUNCTIONALITY - END
+//#####################################################################
+}); // each element
+};
+/*--------------------------------------------------------*/
+/*
+### Core functionality and API ###
+*/
+$.extend($.fn.MultiFile, {
+/**
+* This method removes all selected files
+*
+* Returns a jQuery collection of all affected elements.
+*
+* @name reset
+* @type jQuery
+* @cat Plugins/MultiFile
+* @author Diego A. (http://www.fyneworks.com/)
+*
+* @example $.fn.MultiFile.reset();
+*/
+reset: function(){
+var settings = $(this).data('MultiFile');
+//if(settings) settings.wrapper.find('a.MultiFile-remove').click();
+if(settings) settings.list.find('a.MultiFile-remove').click();
+return $(this);
+},
+/**
+* This utility makes it easy to disable all 'empty' file elements in the document before submitting a form.
+* It marks the affected elements so they can be easily re-enabled after the form submission or validation.
+*
+* Returns a jQuery collection of all affected elements.
+*
+* @name disableEmpty
+* @type jQuery
+* @cat Plugins/MultiFile
+* @author Diego A. (http://www.fyneworks.com/)
+*
+* @example $.fn.MultiFile.disableEmpty();
+* @param String class (optional) A string specifying a class to be applied to all affected elements - Default: 'mfD'.
+*/
+disableEmpty: function(klass){ klass = (typeof(klass)=='string'?klass:'')||'mfD';
+var o = [];
+$('input:file.MultiFile').each(function(){ if($(this).val()=='') o[o.length] = this; });
+return $(o).each(function(){ this.disabled = true }).addClass(klass);
+},
+/**
+* This method re-enables 'empty' file elements that were disabled (and marked) with the $.fn.MultiFile.disableEmpty method.
+*
+* Returns a jQuery collection of all affected elements.
+*
+* @name reEnableEmpty
+* @type jQuery
+* @cat Plugins/MultiFile
+* @author Diego A. (http://www.fyneworks.com/)
+*
+* @example $.fn.MultiFile.reEnableEmpty();
+* @param String klass (optional) A string specifying the class that was used to mark affected elements - Default: 'mfD'.
+*/
+reEnableEmpty: function(klass){ klass = (typeof(klass)=='string'?klass:'')||'mfD';
+return $('input:file.'+klass).removeClass(klass).each(function(){ this.disabled = false });
+},
+/**
+* This method will intercept other jQuery plugins and disable empty file input elements prior to form submission
+*
+* @name intercept
+* @cat Plugins/MultiFile
+* @author Diego A. (http://www.fyneworks.com/)
+*
+* @example $.fn.MultiFile.intercept();
+* @param Array methods (optional) Array of method names to be intercepted
+*/
+intercepted: {},
+intercept: function(methods, context, args){
+var method, value; args = args || [];
+if(args.constructor.toString().indexOf("Array")<0) args = [ args ];
+if(typeof(methods)=='function'){
+$.fn.MultiFile.disableEmpty();
+value = methods.apply(context || window, args);
+//SEE-http://code.google.com/p/jquery-multifile-plugin/issues/detail?id=27
+setTimeout(function(){ $.fn.MultiFile.reEnableEmpty() },1000);
+return value;
+};
+if(methods.constructor.toString().indexOf("Array")<0) methods = [methods];
+for(var i=0;i<methods.length;i++){
+method = methods[i]+''; // make sure that we have a STRING
+if(method) (function(method){ // make sure that method is ISOLATED for the interception
+$.fn.MultiFile.intercepted[method] = $.fn[method] || function(){};
+$.fn[method] = function(){
+$.fn.MultiFile.disableEmpty();
+value = $.fn.MultiFile.intercepted[method].apply(this, arguments);
+//SEE-http://code.google.com/p/jquery-multifile-plugin/issues/detail?id=27
+setTimeout(function(){ $.fn.MultiFile.reEnableEmpty() },1000);
+return value;
+}; // interception
+})(method); // MAKE SURE THAT method IS ISOLATED for the interception
+};// for each method
+} // $.fn.MultiFile.intercept
+});
+/*--------------------------------------------------------*/
+/*
+### Default Settings ###
+eg.: You can override default control like this:
+$.fn.MultiFile.options.accept = 'gif|jpg';
+*/
+$.fn.MultiFile.options = { //$.extend($.fn.MultiFile, { options: {
+accept: '', // accepted file extensions
+max: -1,    // maximum number of selectable files
+// name to use for newly created elements
+namePattern: '$name', // same name by default (which creates an array)
+// STRING: collection lets you show messages in different languages
+STRING: {
+remove:'x',
+denied:'You cannot select a $ext file.\nTry again...',
+file:'$file',
+selected:'File selected: $file',
+duplicate:'This file has already been selected:\n$file'
+},
+// name of methods that should be automcatically intercepted so the plugin can disable
+// extra file elements that are empty before execution and automatically re-enable them afterwards
+autoIntercept: [ 'submit', 'ajaxSubmit', 'ajaxForm', 'validate', 'valid' /* array of methods to intercept */ ],
+// error handling function
+error: function(s){
+/*
+ERROR! blockUI is not currently working in IE
+if($.blockUI){
+$.blockUI({
+message: s.replace(/\n/gi,'<br/>'),
+css: { 
+border:'none', padding:'15px', size:'12.0pt',
+backgroundColor:'#900', color:'#fff',
+opacity:'.8','-webkit-border-radius': '10px','-moz-border-radius': '10px'
+}
+});
+window.setTimeout($.unblockUI, 2000);
+}
+else//{// save a byte!
+*/
+alert(s);
+//}// save a byte!
+}
+}; //} });
+/*--------------------------------------------------------*/
+/*
+### Additional Methods ###
+Required functionality outside the plugin's scope
+*/
+// Native input reset method - because this alone doesn't always work: $(element).val('').attr('value', '')[0].value = '';
+$.fn.reset = function(){ return this.each(function(){ try{ this.reset(); }catch(e){} }); };
+/*--------------------------------------------------------*/
+/*
+### Default implementation ###
+The plugin will attach itself to file inputs
+with the class 'multi' when the page loads
+*/
+$(function(){
+//$("input:file.multi").MultiFile();
+$("input[type=file].multi").MultiFile();
+});
+/*# AVOID COLLISIONS #*/
+})(jQuery);
 /*# AVOID COLLISIONS #*/
 // simply mirror the text
 function mirror(text){
diff --git a/fuel/modules/fuel/config/fuel.php b/fuel/modules/fuel/config/fuel.php
index eca035c8b..7d4577b56 100644
--- a/fuel/modules/fuel/config/fuel.php
+++ b/fuel/modules/fuel/config/fuel.php
@@ -183,7 +183,7 @@
 // Javascript files (mostly jquery plugins) to be included other then the controller js files
 $config['fuel_javascript'] = array(
 	
-	'fuel' => array(
+	/*'fuel' => array(
 	'jquery/plugins/jquery-ui-1.8.17.custom.min',
 	'jquery/plugins/jquery.easing',
 	'jquery/plugins/jquery.bgiframe',
@@ -214,9 +214,9 @@
 	// http://stackoverflow.com/questions/10251272/what-could-cause-this-randomly-appearing-error-inside-jquery-itself
 	'jquery/plugins/chrome_pushstack_fix.js',
 	'jqx/plugins/util.js',
-	'fuel/global')
+	'fuel/global')*/
 	
-	//'fuel' => 'fuel/fuel.min'
+	'fuel' => 'fuel/fuel.min'
 );
 
 // CSS other then the fuel.css file which automatically gets loaded
diff --git a/fuel/modules/fuel/libraries/Asset.php b/fuel/modules/fuel/libraries/Asset.php
index 928153284..d48064335 100644
--- a/fuel/modules/fuel/libraries/Asset.php
+++ b/fuel/modules/fuel/libraries/Asset.php
@@ -1488,15 +1488,7 @@ public function optimize($files, $params = array())
 			$gzip .= "\n?>".PHP_EOL;
 			$output = $gzip;
 		}
-		else
-		{
-			$out = "<?php".PHP_EOL;
-			$out .= "header(\"Content-type: ".$mime."; charset: UTF-8\");";
-			$out .= "\n?>".PHP_EOL;
-			$out .= $output;
-			$output = $out;
-		}
-
+		
 		// write contents to file
 		if (!empty($params['destination']))
 		{

From 7797638aa61299090c520447f371af4607ec50c8 Mon Sep 17 00:00:00 2001
From: David McReynolds <dave@thedaylightstudio.com>
Date: Thu, 23 Aug 2018 09:51:25 -0700
Subject: [PATCH 082/129] Fix for 7.2 compatability and embedded list table

---
 fuel/modules/fuel/models/Base_module_model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fuel/modules/fuel/models/Base_module_model.php b/fuel/modules/fuel/models/Base_module_model.php
index c5c867ac0..4534e0f16 100644
--- a/fuel/modules/fuel/models/Base_module_model.php
+++ b/fuel/modules/fuel/models/Base_module_model.php
@@ -1239,7 +1239,7 @@ public function get_embedded_list_items($params, $list_cols = array(), $actions
 			foreach($params['tooltip_char_limit'] as $field => $limit)
 			{
 				$limit = (int) $limit;
-				$tooltip_func = function($values) use ($field) {
+				$tooltip_func = function($values) use ($field, $limit) {
 					$value = strip_tags($values[$field]);
  						if (strlen($value) > $limit)
 						{

From 5e879a1428fafa48f330b8dd4af22784760d41c1 Mon Sep 17 00:00:00 2001
From: David McReynolds <dave@thedaylightstudio.com>
Date: Thu, 23 Aug 2018 12:56:37 -0700
Subject: [PATCH 083/129] CI 3.1.9 Updates

---
 fuel/application/config/MY_fuel_layouts.php   |  1 +
 fuel/application/config/mimes.php             |  3 ++-
 fuel/application/config/user_agents.php       |  2 +-
 fuel/codeigniter/core/CodeIgniter.php         |  2 +-
 fuel/codeigniter/database/DB_driver.php       |  2 +-
 .../codeigniter/database/DB_query_builder.php |  8 +++---
 fuel/codeigniter/helpers/html_helper.php      |  6 ++---
 fuel/codeigniter/helpers/url_helper.php       |  2 +-
 fuel/codeigniter/libraries/Email.php          | 12 +++++++--
 .../codeigniter/libraries/Form_validation.php |  6 ++++-
 .../codeigniter/libraries/Session/Session.php |  2 +-
 .../libraries/Session/Session_driver.php      | 17 ++++++++++++
 .../drivers/Session_database_driver.php       | 26 +++++++++++++++++++
 .../Session/drivers/Session_files_driver.php  | 18 +++++++++++++
 .../drivers/Session_memcached_driver.php      | 19 ++++++++++++++
 .../Session/drivers/Session_redis_driver.php  | 18 +++++++++++++
 16 files changed, 128 insertions(+), 16 deletions(-)

diff --git a/fuel/application/config/MY_fuel_layouts.php b/fuel/application/config/MY_fuel_layouts.php
index e46b8d6c2..cadaf9f06 100644
--- a/fuel/application/config/MY_fuel_layouts.php
+++ b/fuel/application/config/MY_fuel_layouts.php
@@ -29,6 +29,7 @@
 		'heading' => array('label' => lang('layout_field_heading')),
 		'body' => array('label' => lang('layout_field_body'), 'type' => 'textarea', 'description' => lang('layout_field_body_description')),
 		'body_class' => array('label' => lang('layout_field_body_class')),
+		'template' => array('type' => 'template', 'repeatable' => TRUE, 'fields' => array('subtemplate' => array('type' => 'template', 'fields' => array('test1'=> array('type' => 'keyval')))))
 	)
 );
 
diff --git a/fuel/application/config/mimes.php b/fuel/application/config/mimes.php
index 017653335..0ec9db0a0 100755
--- a/fuel/application/config/mimes.php
+++ b/fuel/application/config/mimes.php
@@ -155,7 +155,8 @@
 	'ics'	=>	'text/calendar',
 	'ical'	=>	'text/calendar',
 	'zsh'	=>	'text/x-scriptzsh',
-	'7zip'	=>	array('application/x-compressed', 'application/x-zip-compressed', 'application/zip', 'multipart/x-zip'),
+	'7z'	=>	array('application/x-7z-compressed', 'application/x-compressed', 'application/x-zip-compressed', 'application/zip', 'multipart/x-zip'),
+	'7zip'	=>	array('application/x-7z-compressed', 'application/x-compressed', 'application/x-zip-compressed', 'application/zip', 'multipart/x-zip'),
 	'cdr'	=>	array('application/cdr', 'application/coreldraw', 'application/x-cdr', 'application/x-coreldraw', 'image/cdr', 'image/x-cdr', 'zz-application/zz-winassoc-cdr'),
 	'wma'	=>	array('audio/x-ms-wma', 'video/x-ms-asf'),
 	'jar'	=>	array('application/java-archive', 'application/x-java-application', 'application/x-jar', 'application/x-compressed'),
diff --git a/fuel/application/config/user_agents.php b/fuel/application/config/user_agents.php
index 798086b65..b6c85631e 100755
--- a/fuel/application/config/user_agents.php
+++ b/fuel/application/config/user_agents.php
@@ -61,7 +61,7 @@
 $browsers = array(
 	'OPR'			=> 'Opera',
 	'Flock'			=> 'Flock',
-	'Edge'			=> 'Spartan',
+	'Edge'			=> 'Edge',
 	'Chrome'		=> 'Chrome',
 	// Opera 10+ always reports Opera/9.80 and appends Version/<real version> to the user agent string
 	'Opera.*?Version'	=> 'Opera',
diff --git a/fuel/codeigniter/core/CodeIgniter.php b/fuel/codeigniter/core/CodeIgniter.php
index 4ad513dd6..7b1dcc2f1 100755
--- a/fuel/codeigniter/core/CodeIgniter.php
+++ b/fuel/codeigniter/core/CodeIgniter.php
@@ -55,7 +55,7 @@
  * @var	string
  *
  */
-	const CI_VERSION = '3.1.8';
+	const CI_VERSION = '3.1.9';
 
 /*
  * ------------------------------------------------------
diff --git a/fuel/codeigniter/database/DB_driver.php b/fuel/codeigniter/database/DB_driver.php
index 059849771..f8956f069 100755
--- a/fuel/codeigniter/database/DB_driver.php
+++ b/fuel/codeigniter/database/DB_driver.php
@@ -1528,7 +1528,7 @@ protected function _update($table, $values)
 		return 'UPDATE '.$table.' SET '.implode(', ', $valstr)
 			.$this->_compile_wh('qb_where')
 			.$this->_compile_order_by()
-			.($this->qb_limit ? ' LIMIT '.$this->qb_limit : '');
+			.($this->qb_limit !== FALSE ? ' LIMIT '.$this->qb_limit : '');
 	}
 
 	// --------------------------------------------------------------------
diff --git a/fuel/codeigniter/database/DB_query_builder.php b/fuel/codeigniter/database/DB_query_builder.php
index 8f477e3a1..3d0c329b0 100755
--- a/fuel/codeigniter/database/DB_query_builder.php
+++ b/fuel/codeigniter/database/DB_query_builder.php
@@ -970,7 +970,7 @@ protected function _like($field, $match = '', $type = 'AND ', $side = 'both', $n
 					$v = "'{$v}'";
 					break;
 				case 'before':
-					$v = "%'{$v}'";
+					$v = "'%{$v}'";
 					break;
 				case 'after':
 					$v = "'{$v}%'";
@@ -987,7 +987,7 @@ protected function _like($field, $match = '', $type = 'AND ', $side = 'both', $n
 				$v .= sprintf($this->_like_escape_str, $this->_like_escape_chr);
 			}
 
-			$qb_where = array('condition' => "{$prefix} {$k} {$not} LIKE", 'value' => $v, 'escape' => $escape);
+			$qb_where = array('condition' => "{$prefix} {$k} {$not} LIKE {$v}", 'value' => NULL, 'escape' => $escape);
 			$this->qb_where[] = $qb_where;
 			if ($this->qb_caching === TRUE)
 			{
@@ -2215,7 +2215,7 @@ public function delete($table = '', $where = '', $limit = NULL, $reset_data = TR
 	protected function _delete($table)
 	{
 		return 'DELETE FROM '.$table.$this->_compile_wh('qb_where')
-			.($this->qb_limit ? ' LIMIT '.$this->qb_limit : '');
+			.($this->qb_limit !== FALSE ? ' LIMIT '.$this->qb_limit : '');
 	}
 
 	// --------------------------------------------------------------------
@@ -2365,7 +2365,7 @@ protected function _compile_select($select_override = FALSE)
 			.$this->_compile_order_by(); // ORDER BY
 
 		// LIMIT
-		if ($this->qb_limit OR $this->qb_offset)
+		if ($this->qb_limit !== FALSE OR $this->qb_offset)
 		{
 			return $this->_limit($sql."\n");
 		}
diff --git a/fuel/codeigniter/helpers/html_helper.php b/fuel/codeigniter/helpers/html_helper.php
index 5cec4597b..260afe9a2 100755
--- a/fuel/codeigniter/helpers/html_helper.php
+++ b/fuel/codeigniter/helpers/html_helper.php
@@ -200,7 +200,7 @@ function img($src = '', $index_page = FALSE, $attributes = '')
 				}
 				else
 				{
-					$img .= ' src="'.get_instance()->config->slash_item('base_url').$v.'"';
+					$img .= ' src="'.get_instance()->config->base_url($v).'"';
 				}
 			}
 			else
@@ -292,7 +292,7 @@ function link_tag($href = '', $rel = 'stylesheet', $type = 'text/css', $title =
 					}
 					else
 					{
-						$link .= 'href="'.$CI->config->slash_item('base_url').$v.'" ';
+						$link .= 'href="'.$CI->config->base_url($v).'" ';
 					}
 				}
 				else
@@ -313,7 +313,7 @@ function link_tag($href = '', $rel = 'stylesheet', $type = 'text/css', $title =
 			}
 			else
 			{
-				$link .= 'href="'.$CI->config->slash_item('base_url').$href.'" ';
+				$link .= 'href="'.$CI->config->base_url($href).'" ';
 			}
 
 			$link .= 'rel="'.$rel.'" type="'.$type.'" ';
diff --git a/fuel/codeigniter/helpers/url_helper.php b/fuel/codeigniter/helpers/url_helper.php
index 0359ac92c..a22c4c215 100755
--- a/fuel/codeigniter/helpers/url_helper.php
+++ b/fuel/codeigniter/helpers/url_helper.php
@@ -396,7 +396,7 @@ function auto_link($str, $type = 'both', $popup = FALSE)
 		if ($type !== 'email' && preg_match_all('#(\w*://|www\.)[a-z0-9]+(-+[a-z0-9]+)*(\.[a-z0-9]+(-+[a-z0-9]+)*)+(/([^\s()<>;]+\w)?/?)?#i', $str, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER))
 		{
 			// Set our target HTML if using popup links.
-			$target = ($popup) ? ' target="_blank"' : '';
+			$target = ($popup) ? ' target="_blank" rel="noopener"' : '';
 
 			// We process the links in reverse order (last -> first) so that
 			// the returned string offsets from preg_match_all() are not
diff --git a/fuel/codeigniter/libraries/Email.php b/fuel/codeigniter/libraries/Email.php
index a53e7e72a..cd74d6da1 100755
--- a/fuel/codeigniter/libraries/Email.php
+++ b/fuel/codeigniter/libraries/Email.php
@@ -1038,7 +1038,11 @@ public function valid_email($email)
 			$domain = defined('INTL_IDNA_VARIANT_UTS46')
 				? idn_to_ascii($domain, 0, INTL_IDNA_VARIANT_UTS46)
 				: idn_to_ascii($domain);
-			$email = $account.'@'.$domain;
+
+			if ($domain !== FALSE)
+			{
+				$email = $account.'@'.$domain;
+			}
 		}
 
 		return (bool) filter_var($email, FILTER_VALIDATE_EMAIL);
@@ -1859,7 +1863,11 @@ protected function _validate_email_for_shell(&$email)
 			$domain = defined('INTL_IDNA_VARIANT_UTS46')
 				? idn_to_ascii($domain, 0, INTL_IDNA_VARIANT_UTS46)
 				: idn_to_ascii($domain);
-			$email = $account.'@'.$domain;
+
+			if ($domain !== FALSE)
+			{
+				$email = $account.'@'.$domain;
+			}
 		}
 
 		return (filter_var($email, FILTER_VALIDATE_EMAIL) === $email && preg_match('#\A[a-z0-9._+-]+@[a-z0-9.-]{1,253}\z#i', $email));
diff --git a/fuel/codeigniter/libraries/Form_validation.php b/fuel/codeigniter/libraries/Form_validation.php
index 6a97ee599..27187df2c 100755
--- a/fuel/codeigniter/libraries/Form_validation.php
+++ b/fuel/codeigniter/libraries/Form_validation.php
@@ -1234,7 +1234,11 @@ public function valid_email($str)
 			$domain = defined('INTL_IDNA_VARIANT_UTS46')
 				? idn_to_ascii($matches[2], 0, INTL_IDNA_VARIANT_UTS46)
 				: idn_to_ascii($matches[2]);
-			$str = $matches[1].'@'.$domain;
+
+			if ($domain !== FALSE)
+			{
+				$str = $matches[1].'@'.$domain;
+			}
 		}
 
 		return (bool) filter_var($str, FILTER_VALIDATE_EMAIL);
diff --git a/fuel/codeigniter/libraries/Session/Session.php b/fuel/codeigniter/libraries/Session/Session.php
index 9e762745f..aa1fafb5b 100755
--- a/fuel/codeigniter/libraries/Session/Session.php
+++ b/fuel/codeigniter/libraries/Session/Session.php
@@ -604,7 +604,7 @@ public function get_temp_keys()
 	// ------------------------------------------------------------------------
 
 	/**
-	 * Unmark flash
+	 * Unmark temp
 	 *
 	 * @param	mixed	$key	Session data key(s)
 	 * @return	void
diff --git a/fuel/codeigniter/libraries/Session/Session_driver.php b/fuel/codeigniter/libraries/Session/Session_driver.php
index bef5ee41f..2fe30b8a2 100755
--- a/fuel/codeigniter/libraries/Session/Session_driver.php
+++ b/fuel/codeigniter/libraries/Session/Session_driver.php
@@ -112,6 +112,23 @@ public function __construct(&$params)
 
 	// ------------------------------------------------------------------------
 
+	/**
+	 * PHP 5.x validate ID
+	 *
+	 * Enforces session.use_strict_mode on PHP 5.x (7+ does it by itself)
+	 *
+	 * @return	void
+	 */
+	public function php5_validate_id()
+	{
+		if (PHP_VERSION_ID < 70000 && isset($_COOKIE[$this->_config['cookie_name']]) && ! $this->validateId($_COOKIE[$this->_config['cookie_name']]))
+		{
+			unset($_COOKIE[$this->_config['cookie_name']]);
+		}
+	}
+
+	// ------------------------------------------------------------------------
+
 	/**
 	 * Cookie destroy
 	 *
diff --git a/fuel/codeigniter/libraries/Session/drivers/Session_database_driver.php b/fuel/codeigniter/libraries/Session/drivers/Session_database_driver.php
index ae7a1b4a1..074accfe7 100755
--- a/fuel/codeigniter/libraries/Session/drivers/Session_database_driver.php
+++ b/fuel/codeigniter/libraries/Session/drivers/Session_database_driver.php
@@ -133,6 +133,8 @@ public function open($save_path, $name)
 			return $this->_fail();
 		}
 
+		$this->php5_validate_id();
+
 		return $this->_success;
 	}
 
@@ -340,6 +342,30 @@ public function gc($maxlifetime)
 			: $this->_fail();
 	}
 
+	// --------------------------------------------------------------------
+
+	/**
+	 * Validate ID
+	 *
+	 * Checks whether a session ID record exists server-side,
+	 * to enforce session.use_strict_mode.
+	 *
+	 * @param	string	$id
+	 * @return	bool
+	 */
+	public function validateId($id)
+	{
+		// Prevent previous QB calls from messing with our queries
+		$this->_db->reset_query();
+
+		$this->_db->select('1')->from($this->_config['save_path'])->where('id', $id);
+		empty($this->_config['match_ip']) OR $this->_db->where('ip_address', $_SERVER['REMOTE_ADDR']);
+		$result = $this->_db->get();
+		empty($result) OR $result = $result->row();
+
+		return ! empty($result);
+	}
+
 	// ------------------------------------------------------------------------
 
 	/**
diff --git a/fuel/codeigniter/libraries/Session/drivers/Session_files_driver.php b/fuel/codeigniter/libraries/Session/drivers/Session_files_driver.php
index c6d789aae..654f30010 100755
--- a/fuel/codeigniter/libraries/Session/drivers/Session_files_driver.php
+++ b/fuel/codeigniter/libraries/Session/drivers/Session_files_driver.php
@@ -148,6 +148,8 @@ public function open($save_path, $name)
 			.$name // we'll use the session cookie name as a prefix to avoid collisions
 			.($this->_config['match_ip'] ? md5($_SERVER['REMOTE_ADDR']) : '');
 
+		$this->php5_validate_id();
+
 		return $this->_success;
 	}
 
@@ -391,6 +393,22 @@ public function gc($maxlifetime)
 
 	// --------------------------------------------------------------------
 
+	/**
+	 * Validate ID
+	 *
+	 * Checks whether a session ID record exists server-side,
+	 * to enforce session.use_strict_mode.
+	 *
+	 * @param	string	$id
+	 * @return	bool
+	 */
+	public function validateId($id)
+	{
+		return is_file($this->_file_path.$id);
+	}
+
+	// --------------------------------------------------------------------
+
 	/**
 	 * Byte-safe strlen()
 	 *
diff --git a/fuel/codeigniter/libraries/Session/drivers/Session_memcached_driver.php b/fuel/codeigniter/libraries/Session/drivers/Session_memcached_driver.php
index b109738c2..7d8e39022 100755
--- a/fuel/codeigniter/libraries/Session/drivers/Session_memcached_driver.php
+++ b/fuel/codeigniter/libraries/Session/drivers/Session_memcached_driver.php
@@ -145,6 +145,8 @@ public function open($save_path, $name)
 			return $this->_fail();
 		}
 
+		$this->php5_validate_id();
+
 		return $this->_success;
 	}
 
@@ -290,6 +292,23 @@ public function gc($maxlifetime)
 		return $this->_success;
 	}
 
+	// --------------------------------------------------------------------
+
+	/**
+	 * Validate ID
+	 *
+	 * Checks whether a session ID record exists server-side,
+	 * to enforce session.use_strict_mode.
+	 *
+	 * @param	string	$id
+	 * @return	bool
+	 */
+	public function validateId($id)
+	{
+		$this->_memcached-get($this->_key_prefix.$id);
+		return ($this->_memcached->getResultCode() === Memcached::RES_SUCCESS);
+	}
+
 	// ------------------------------------------------------------------------
 
 	/**
diff --git a/fuel/codeigniter/libraries/Session/drivers/Session_redis_driver.php b/fuel/codeigniter/libraries/Session/drivers/Session_redis_driver.php
index 413c30d67..d7a57550a 100755
--- a/fuel/codeigniter/libraries/Session/drivers/Session_redis_driver.php
+++ b/fuel/codeigniter/libraries/Session/drivers/Session_redis_driver.php
@@ -153,6 +153,8 @@ public function open($save_path, $name)
 			return $this->_success;
 		}
 
+		$this->php5_validate_id();
+
 		return $this->_fail();
 	}
 
@@ -310,6 +312,22 @@ public function gc($maxlifetime)
 		return $this->_success;
 	}
 
+	// --------------------------------------------------------------------
+
+	/**
+	 * Validate ID
+	 *
+	 * Checks whether a session ID record exists server-side,
+	 * to enforce session.use_strict_mode.
+	 *
+	 * @param	string	$id
+	 * @return	bool
+	 */
+	public function validateId($id)
+	{
+		return (bool) $this->_redis->exists($this->_key_prefix.$id);
+	}
+
 	// ------------------------------------------------------------------------
 
 	/**

From 4cbdd99e3254b4d7d6e15c0af971eb142ffdfb0e Mon Sep 17 00:00:00 2001
From: David McReynolds <dave@thedaylightstudio.com>
Date: Thu, 23 Aug 2018 16:11:05 -0700
Subject: [PATCH 084/129] Changed fuel_javascript back to being unminified
 because it tests faster

---
 fuel/modules/fuel/config/fuel.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/fuel/modules/fuel/config/fuel.php b/fuel/modules/fuel/config/fuel.php
index 7d4577b56..4712ef85c 100644
--- a/fuel/modules/fuel/config/fuel.php
+++ b/fuel/modules/fuel/config/fuel.php
@@ -183,7 +183,7 @@
 // Javascript files (mostly jquery plugins) to be included other then the controller js files
 $config['fuel_javascript'] = array(
 	
-	/*'fuel' => array(
+	'fuel' => array(
 	'jquery/plugins/jquery-ui-1.8.17.custom.min',
 	'jquery/plugins/jquery.easing',
 	'jquery/plugins/jquery.bgiframe',
@@ -214,9 +214,10 @@
 	// http://stackoverflow.com/questions/10251272/what-could-cause-this-randomly-appearing-error-inside-jquery-itself
 	'jquery/plugins/chrome_pushstack_fix.js',
 	'jqx/plugins/util.js',
-	'fuel/global')*/
+	'fuel/global')
 	
-	'fuel' => 'fuel/fuel.min'
+	// This is actually slower it appears now???
+	//'fuel' => 'fuel/fuel.min'
 );
 
 // CSS other then the fuel.css file which automatically gets loaded

From 81aa6567d5b36ea48a293f56f16fce841853b6d4 Mon Sep 17 00:00:00 2001
From: David McReynolds <dave@thedaylightstudio.com>
Date: Sat, 25 Aug 2018 07:51:00 -0700
Subject: [PATCH 085/129] fix for broken image in inline-editing.php docs page

---
 fuel/modules/fuel/views/_docs/general/inline-editing.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fuel/modules/fuel/views/_docs/general/inline-editing.php b/fuel/modules/fuel/views/_docs/general/inline-editing.php
index 3b8f74056..eb9347fe9 100644
--- a/fuel/modules/fuel/views/_docs/general/inline-editing.php
+++ b/fuel/modules/fuel/views/_docs/general/inline-editing.php
@@ -33,7 +33,7 @@
 </pre>
 
 <p>For inline editing to work, you must be logged into FUEL and have the proper permissions to edit the page or module information. 
-A <span style="background: transparent url(<?=img_path('ico_pencil.png', FUEL_FOLDER)?>) no-repeat; display: inline-block; height: 16px; width: 16px;"></span> pencil icon
+A <span style="background: transparent url(<?=img_path('icons/ico_pencil.png', FUEL_FOLDER)?>) no-repeat; display: inline-block; height: 16px; width: 16px;"></span> pencil icon
 will appear over editable areas when the editing for the page is toggled on. Clicking on the icon will overlay a form over your page to edit the values in context.</p>
 
 <h2>Page Inline Editing</h2>

From f09c53bbaf2facd59a5f889e4178bffd6f4822a3 Mon Sep 17 00:00:00 2001
From: Martynas Sateika <martynas.sateika@gmail.com>
Date: Wed, 29 Aug 2018 00:26:05 +0100
Subject: [PATCH 086/129] Add missing closing bracket in code example

---
 fuel/modules/fuel/views/_docs/general/opt-in-controllers.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fuel/modules/fuel/views/_docs/general/opt-in-controllers.php b/fuel/modules/fuel/views/_docs/general/opt-in-controllers.php
index be13492b0..60506594d 100644
--- a/fuel/modules/fuel/views/_docs/general/opt-in-controllers.php
+++ b/fuel/modules/fuel/views/_docs/general/opt-in-controllers.php
@@ -110,9 +110,9 @@ function contact()
 		
 		// use Fuel_page to render so it will grab all opt-in variables and do any necessary parsing
 		$this->fuel->pages->render('about/contact', $vars);
-		
-		
 	}
+
+}
 </pre>
 
 

From cfb39e6887fd4807423e95baed153b438bbf7c03 Mon Sep 17 00:00:00 2001
From: Martynas Sateika <martynas.sateika@gmail.com>
Date: Wed, 29 Aug 2018 00:33:12 +0100
Subject: [PATCH 087/129] Fix constructor name in code example

---
 fuel/modules/fuel/views/_docs/general/opt-in-controllers.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fuel/modules/fuel/views/_docs/general/opt-in-controllers.php b/fuel/modules/fuel/views/_docs/general/opt-in-controllers.php
index 60506594d..b13839196 100644
--- a/fuel/modules/fuel/views/_docs/general/opt-in-controllers.php
+++ b/fuel/modules/fuel/views/_docs/general/opt-in-controllers.php
@@ -96,7 +96,7 @@
 <pre class="brush:php">
 class About extends CI_Controller {
 	
-	function About()
+	function __construct()
 	{
 		parent::__construct();
 	}

From 8525ebaada652083b2b76e9adce4ce8b6b02b662 Mon Sep 17 00:00:00 2001
From: Martynas Sateika <martynas.sateika@gmail.com>
Date: Thu, 30 Aug 2018 00:15:31 +0100
Subject: [PATCH 088/129] Update old EllisLab URLs to point to CodeIgniter.com

---
 fuel/modules/fuel/libraries/Fuel_assets.php   |  4 +--
 fuel/modules/fuel/libraries/Fuel_layouts.php  |  2 +-
 .../views/_docs/general/configs-settings.php  | 22 +++++++--------
 .../fuel/views/_docs/general/constants.php    |  2 +-
 .../fuel/views/_docs/general/forms.php        |  2 +-
 .../fuel/views/_docs/general/javascript.php   |  2 +-
 .../fuel/views/_docs/general/localization.php |  2 +-
 .../fuel/views/_docs/general/migrations.php   |  2 +-
 .../fuel/views/_docs/general/models.php       | 28 +++++++++----------
 .../fuel/views/_docs/general/redirects.php    |  2 +-
 .../fuel/views/_docs/general/security.php     |  4 +--
 .../views/_docs/general/template-parsing.php  |  6 ++--
 .../fuel/views/_docs/general/views.php        |  2 +-
 .../views/_docs/installation/db-setup.php     |  2 +-
 .../_docs/installation/troubleshooting.php    |  6 ++--
 .../views/_docs/introduction/what-is-fuel.php |  2 +-
 .../fuel/views/_docs/libraries/cache.php      |  2 +-
 .../fuel/views/_docs/libraries/my_hooks.php   |  2 +-
 .../views/_docs/libraries/my_image_lib.php    |  2 +-
 fuel/modules/fuel/views/_docs/modules.php     |  2 +-
 .../fuel/views/_docs/modules/generate.php     |  2 +-
 .../fuel/views/_docs/modules/hooks.php        |  4 +--
 .../fuel/views/_docs/modules/simple.php       |  2 +-
 .../fuel/views/_docs/modules/tutorial.php     |  2 +-
 24 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/fuel/modules/fuel/libraries/Fuel_assets.php b/fuel/modules/fuel/libraries/Fuel_assets.php
index fc637e454..54ab41e50 100644
--- a/fuel/modules/fuel/libraries/Fuel_assets.php
+++ b/fuel/modules/fuel/libraries/Fuel_assets.php
@@ -439,7 +439,7 @@ public function sanitize_filename($file_name)
 	// --------------------------------------------------------------------
 	
 	/**
-	 * Returns the <a href="http://ellislab.com/codeigniter/user-guide/libraries/file_uploading.html" target="_blank">uploaded file information</a>.
+	 * Returns the <a href="https://www.codeigniter.com/user_guide/libraries/file_uploading.html" target="_blank">uploaded file information</a>.
 	 *
 	 * @access	public
 	 * @param	string	The uploaded $_FILE key value (optional)
@@ -457,7 +457,7 @@ public function uploaded_data($key = NULL)
 	// --------------------------------------------------------------------
 	
 	/**
-	 * Normalizes the $_FILES array so that the <a href="http://ellislab.com/codeigniter/user-guide/libraries/file_uploading.html" target="_blank">CI File Upload Class</a> will work correctly
+	 * Normalizes the $_FILES array so that the <a href="https://www.codeigniter.com/user_guide/libraries/file_uploading.html" target="_blank">CI File Upload Class</a> will work correctly
 	 *
 	 * @access	public
 	 * @return	void
diff --git a/fuel/modules/fuel/libraries/Fuel_layouts.php b/fuel/modules/fuel/libraries/Fuel_layouts.php
index 94f692e27..89338c8c2 100644
--- a/fuel/modules/fuel/libraries/Fuel_layouts.php
+++ b/fuel/modules/fuel/libraries/Fuel_layouts.php
@@ -954,7 +954,7 @@ public function field_value($key)
 	 *
 	 * @access	public
 	 * @param	key		The type of hook (e.g. "pre_render" or "post_render")
-	 * @param	array	An array of hook information including the class/callback function. <a href="http://ellislab.com/codeigniter/user-guide/general/hooks.html" target="blank">More here</a>
+	 * @param	array	An array of hook information including the class/callback function. <a href="https://www.codeigniter.com/user_guide/general/hooks.html" target="blank">More here</a>
 	 * @return	object 	reference to this Fuel_layout object
 	 */
 	public function set_hook($type, $hook)
diff --git a/fuel/modules/fuel/views/_docs/general/configs-settings.php b/fuel/modules/fuel/views/_docs/general/configs-settings.php
index f8c6dcad8..5e9b25800 100644
--- a/fuel/modules/fuel/views/_docs/general/configs-settings.php
+++ b/fuel/modules/fuel/views/_docs/general/configs-settings.php
@@ -51,19 +51,19 @@
 	<li><strong>autoload:</strong> sets the packages, libraries, helpers, configs, languages and model files. 
 		FUEL automatically includes the <span class="file">fuel/modules/fuel</span> folder as a package path which allows 
 		it to store a lot of the files in that folder instead of the <span class="file">fuel/application</span> folder</li>
-	<li><strong>config:</strong> the <a href="http://ellislab.com/codeigniter/user-guide/libraries/config.html" target="_blank">CodeIgniter config file</a></li>
+	<li><strong>config:</strong> the <a href="https://www.codeigniter.com/user_guide/libraries/config.html" target="_blank">CodeIgniter config file</a></li>
 	<li><strong>constants:</strong> includes both the Codeigniter and FUEL specific constants and is loaded very early on in the bootstrap process</li>
-	<li><strong>database:</strong> the <a href="http://ellislab.com/codeigniter/user-guide/database/configuration.html" target="_blank">CodeIgniter database config file</a></li>
-	<li><strong>doctypes:</strong> used in the <a href="http://ellislab.com/codeigniter/user-guide/helpers/html_helper.html#doctype" target="_blank">CodeIgniter HTML helper function <dfn>doctype()</dfn></a></li>
-	<li><strong>foreign_chars:</strong>  used in the <a href="http://ellislab.com/codeigniter/user-guide/helpers/text_helper.html" target="_blank">CodeIgniter text helper function <dfn>convert_accented_characters()</dfn></a></li>
-	<li><strong>hooks:</strong> the <a href="http://ellislab.com/codeigniter/user-guide/general/hooks.html" target="_blank">CodeIgniter Hooks</a> configuration. By default it includes the <span class="file">fuel/modules/fuel/config/fuel_hooks.php</span>
+	<li><strong>database:</strong> the <a href="https://www.codeigniter.com/user_guide/database/configuration.html" target="_blank">CodeIgniter database config file</a></li>
+	<li><strong>doctypes:</strong> used in the <a href="https://www.codeigniter.com/user_guide/helpers/html_helper.html#doctype" target="_blank">CodeIgniter HTML helper function <dfn>doctype()</dfn></a></li>
+	<li><strong>foreign_chars:</strong>  used in the <a href="https://www.codeigniter.com/user_guide/helpers/text_helper.html#convert_accented_characters" target="_blank">CodeIgniter text helper function <dfn>convert_accented_characters()</dfn></a></li>
+	<li><strong>hooks:</strong> the <a href="https://www.codeigniter.com/user_guide/general/hooks.html" target="_blank">CodeIgniter Hooks</a> configuration. By default it includes the <span class="file">fuel/modules/fuel/config/fuel_hooks.php</span>
 		file which contains FUEL specific hooks. </li>
-	<li><strong>migration:</strong> the <a href="http://ellislab.com/codeigniter/user-guide/libraries/migration.html" target="_blank">CodeIgniter Migration</a> configuration. </li>
-	<li><strong>mimes:</strong> the <a href="http://ellislab.com/codeigniter/user-guide/libraries/migration.html" target="_blank">CodeIgniter mimes</a> configuration used by such classes 
-			as the CodeIgniter <a href="http://ellislab.com/codeigniter/user-guide/libraries/output.html" target="_blank">Output class</a>, the <a href="http://ellislab.com/codeigniter/user-guide/libraries/file_uploading.html" target="_blank">Upload class</a>, 
-			the <a href="http://ellislab.com/codeigniter/user-guide/helpers/file_helper.html" target="_blank">file helper</a> and the <a href="http://ellislab.com/codeigniter/user-guide/helpers/download_helper.html" target="_blank">download helper</a>.</li>
-	<li><strong>routes:</strong> the <a href="http://ellislab.com/codeigniter/user-guide/general/routing.html" target="_blank">CodeIgniter Routing</a> configuration</li>
-	<li><strong>smileys:</strong> the <a href="http://ellislab.com/codeigniter/user-guide/helpers/smiley_helper.html" target="_blank">Smiley helper function</a> configuration</li>
+	<li><strong>migration:</strong> the <a href="https://www.codeigniter.com/user_guide/libraries/migration.html" target="_blank">CodeIgniter Migration</a> configuration. </li>
+	<li><strong>mimes:</strong> the <a href="https://www.codeigniter.com/user_guide/libraries/migration.html" target="_blank">CodeIgniter mimes</a> configuration used by such classes
+			as the CodeIgniter <a href="https://www.codeigniter.com/user_guide/libraries/output.html" target="_blank">Output class</a>, the <a href="https://www.codeigniter.com/user_guide/libraries/file_uploading.html" target="_blank">Upload class</a>,
+			the <a href="https://www.codeigniter.com/user_guide/helpers/file_helper.html" target="_blank">file helper</a> and the <a href="https://www.codeigniter.com/user_guide/helpers/download_helper.html" target="_blank">download helper</a>.</li>
+	<li><strong>routes:</strong> the <a href="https://www.codeigniter.com/user_guide/general/routing.html" target="_blank">CodeIgniter Routing</a> configuration</li>
+	<li><strong>smileys:</strong> the <a href="https://www.codeigniter.com/user_guide/helpers/smiley_helper.html" target="_blank">Smiley helper function</a> configuration</li>
 </ul>
 
 
diff --git a/fuel/modules/fuel/views/_docs/general/constants.php b/fuel/modules/fuel/views/_docs/general/constants.php
index b491c2e2a..65c9635ef 100644
--- a/fuel/modules/fuel/views/_docs/general/constants.php
+++ b/fuel/modules/fuel/views/_docs/general/constants.php
@@ -1,5 +1,5 @@
 <h1>FUEL Constants</h1>
-<p>In addition to the <a href="http://ellislab.com/codeigniter/user-guide/general/reserved_names.html" target="_blank">CodeIgniter constants</a>, FUEL CMS provides the following:</p>
+<p>In addition to the <a href="https://www.codeigniter.com/user_guide/general/reserved_names.html" target="_blank">CodeIgniter constants</a>, FUEL CMS provides the following:</p>
 
 <ul>
 	<li><strong>FUEL_VERSION</strong>: The current version number of FUEL</li>
diff --git a/fuel/modules/fuel/views/_docs/general/forms.php b/fuel/modules/fuel/views/_docs/general/forms.php
index 893c5df7a..afe9606e7 100644
--- a/fuel/modules/fuel/views/_docs/general/forms.php
+++ b/fuel/modules/fuel/views/_docs/general/forms.php
@@ -998,7 +998,7 @@ function my_custom_field($params)
 
 <h3 id="slug" class="toggle">slug</h3>
 <div class="toggle_block_off">
-	<p>This field type can be used for creating slug or permalink values for a field using the <a href="http://ellislab.com/codeigniter/user-guide/helpers/url_helper.html" target="_blank">url_title</a> function.
+	<p>This field type can be used for creating slug or permalink values for a field using the <a href="https://www.codeigniter.com/user_guide/helpers/url_helper.html#url_title" target="_blank">url_title</a> function.
 	The following additional parameter can be passed to this field type:</p>
 	<ul>
 		<li><strong>linked_to</strong>: the field whose value to use if no value is provided.
diff --git a/fuel/modules/fuel/views/_docs/general/javascript.php b/fuel/modules/fuel/views/_docs/general/javascript.php
index e7d055203..58cc8fad8 100644
--- a/fuel/modules/fuel/views/_docs/general/javascript.php
+++ b/fuel/modules/fuel/views/_docs/general/javascript.php
@@ -161,7 +161,7 @@
 <h3>jQX Configuration Parameters</h3>
 <p>The following jqx config parameters are available for you to use in your jQX controller:</p>
 <ul>
-	<li><strong>jqx.config.basePath:</strong> The equivalent value to the <a href="http://ellislab.com/codeigniter/user-guide/helpers/url_helper.html" target="_blank">site_url()</a> CI function </li>
+	<li><strong>jqx.config.basePath:</strong> The equivalent value to the <a href="https://www.codeigniter.com/user_guide/helpers/url_helper.html#site_url" target="_blank">site_url()</a> CI function </li>
 	<li><strong>jqx.config.jsPath:</strong> The path to the fuel modules javascript folder which is <span class="file">/fuel/modules/fuel/assets/js/</span></li>
 	<li><strong>jqx.config.imgPath:</strong> The path to the fuel modules images folder which is <span class="file">/fuel/modules/fuel/assets/images/</span></li>
 	<li><strong>jqx.config.uriPath:</strong> The equivalent to the <a href="<?=user_guide_url('helpers/my_url_helper')?>">uri_path()</a> function</li>
diff --git a/fuel/modules/fuel/views/_docs/general/localization.php b/fuel/modules/fuel/views/_docs/general/localization.php
index d8914f8a5..aaa823c1e 100644
--- a/fuel/modules/fuel/views/_docs/general/localization.php
+++ b/fuel/modules/fuel/views/_docs/general/localization.php
@@ -9,7 +9,7 @@
 <p>There are a few different ways to add multi-language support to your website:</p>
 
 <h3>CodIgniter's Language Class</h3>
-<p>CodeIgniter comes with a <a href="http://ellislab.com/codeigniter/user-guide/libraries/language.html" target="_blank">Language class</a> which can is fully available for you to leverage in your site.</p>
+<p>CodeIgniter comes with a <a href="https://www.codeigniter.com/user_guide/libraries/language.html" target="_blank">Language class</a> which can is fully available for you to leverage in your site.</p>
 
 <h3>CMS Pages</h3>
 <p>When multiple languages are configured in the <a href="<?=user_guide_url('installation/configuration')?>">FUEL config</a>, you will see an additional drop down when editing or creating a page in the CMS.
diff --git a/fuel/modules/fuel/views/_docs/general/migrations.php b/fuel/modules/fuel/views/_docs/general/migrations.php
index c2e552e45..1f76ec6ce 100644
--- a/fuel/modules/fuel/views/_docs/general/migrations.php
+++ b/fuel/modules/fuel/views/_docs/general/migrations.php
@@ -1,5 +1,5 @@
 <h1>Migrations</h1>
-<p>FUEL CMS provides a command line utility for using <a href="http://ellislab.com/codeigniter/user-guide/libraries/migration.html" target="_blank">CodeIgniter's migrations</a>.</p>
+<p>FUEL CMS provides a command line utility for using <a href="https://www.codeigniter.com/user_guide/libraries/migration.html" target="_blank">CodeIgniter's migrations</a>.</p>
 
 <pre class="brush:php">
 // updates to the latest migration file regardless of what is specified in the migrations table
diff --git a/fuel/modules/fuel/views/_docs/general/models.php b/fuel/modules/fuel/views/_docs/general/models.php
index 2efcc73a1..9c7fdf61a 100644
--- a/fuel/modules/fuel/views/_docs/general/models.php
+++ b/fuel/modules/fuel/views/_docs/general/models.php
@@ -7,8 +7,8 @@
 
 <h1>Models</h1>
 <p>There are two main classes FUEL provides for creating models. The first, <a href="<?=user_guide_url('libraries/my_model')?>">MY_Model</a>, 
-extends the <a href="http://ellislab.com/codeigniter/user-guide/general/models.html" target="_blank">CI_Model class</a> to provide <a href="<?=user_guide_url('libraries/my_model')?>">common methods</a> for retrieving and manipulating data from the database usually specific to a table.
-It was developed to augment the <a href="http://ellislab.com/codeigniter/user-guide/database/active_record.html" target="_blank">CodeIgniter active record</a> class and <strong>DOES NOT</strong> change any of those methods.
+extends the <a href="https://www.codeigniter.com/user_guide/general/models.html" target="_blank">CI_Model class</a> to provide <a href="<?=user_guide_url('libraries/my_model')?>">common methods</a> for retrieving and manipulating data from the database usually specific to a table.
+It was developed to augment the <a href="https://www.codeigniter.com/userguide2/database/active_record.html" target="_blank">CodeIgniter active record</a> class and <strong>DOES NOT</strong> change any of those methods.
 The second, <a href="<?=user_guide_url('libraries/base_module_model')?>">Base_module_model</a>, extends <a href="<?=user_guide_url('libraries/my_model')?>">MY_Model</a> and provides 
 <a href="<?=user_guide_url('modules/simple')?>">simple module</a> specific methods and is the class you will most likely want to extend for your models. </p>
 
@@ -92,7 +92,7 @@ function get_quote_formatted()
 	<li><a href="<?=user_guide_url('libraries/validator')?>">Validator Class</a></li>
 	<li><a href="<?=user_guide_url('helpers/my_string_helper')?>">String Helper</a></li>
 	<li><a href="<?=user_guide_url('helpers/my_date_helper')?>">Date Helper</a></li>
-	<li><a href="http://ellislab.com/codeigniter/user-guide/helpers/security_helper.html">Security Helper</a></li>
+	<li><a href="https://www.codeigniter.com/user_guide/helpers/security_helper.html">Security Helper</a></li>
 </ul>
 
 <h2 id="table_result_record_field">Table, Result, Record and Field Classes</h2>
@@ -302,7 +302,7 @@ function __construct()
 </pre>
 
 <p>There are also additional <a href="#formattters">formatter</a> variations you can use on a record property &mdash; such as <dfn>{property}_formatted</dfn> and <dfn>{property}_stripped</dfn>.</p>
-<p>Using <dfn>{property}_formatted</dfn> will apply the <a href="http://ellislab.com/codeigniter/user-guide/helpers/typography_helper.html" target="_blank">auto_typography</a>
+<p>Using <dfn>{property}_formatted</dfn> will apply the <a href="https://www.codeigniter.com/user_guide/helpers/typography_helper.html" target="_blank">auto_typography</a>
 function if the property is a string value and if it is a date value will format the date by default to whatever is specified in the <span class="file">fuel/application/config/MY_config.php</span>.
 </p>
 <pre class="brush: php">
@@ -595,7 +595,7 @@ function __construct()
 
 <h2 id="formatters">Formatters</h2>
 <p>Formatters allow you to easily modify a value by mapping a function to a suffix value of a property. 
-An example of this is to use the "_formatted" suffix on a string type field which would apply the <a href="http://ellislab.com/codeigniter/user-guide/helpers/typography_helper.html" target="_blank">auto_typography</a>.</p>
+An example of this is to use the "_formatted" suffix on a string type field which would apply the <a href="https://www.codeigniter.com/user_guide/helpers/typography_helper.html" target="_blank">auto_typography</a>.</p>
 
 <pre class="brush:php">
 echo $record->content;
@@ -643,18 +643,18 @@ function __construct()
 <h3>String Field Examples</h3>
 <p>Below are examples of formatters that can be applied to a string fields (char, varchar, text) and links to the functions that they use.</p>
 <ul>
-	<li><a href="http://ellislab.com/codeigniter/user-guide/helpers/typography_helper.html" target="_blank">{string}_formatted</a> (auto_typography CI function)</li>
+	<li><a href="https://www.codeigniter.com/user_guide/helpers/typography_helper.html#auto_typography" target="_blank">{string}_formatted</a> (auto_typography CI function)</li>
 	<li><a href="http://php.net/manual/en/function.strip-tags.php" target="_blank">{string}_stripped</a></li>
 	<li><a href="<?=user_guide_url('helpers/markdown_helper')?>">{string}_markdown</a></li>
 	<li><a href="<?=user_guide_url('helpers/my_string_helper#func_parse_template_syntax')?>">{string}_parsed</a></li>
-	<li><a href="http://ellislab.com/codeigniter/user-guide/helpers/text_helper.html" target="_blank">{string}_excerpt</a> (word_limiter CI function)</li>
-	<li><a href="http://ellislab.com/codeigniter/user-guide/helpers/text_helper.html" target="_blank">{string}_ellipsize</a> (ellipsize CI function)</li>
-	<li><a href="http://ellislab.com/codeigniter/user-guide/helpers/text_helper.html" target="_blank">{string}_highlight</a> (highlight_phrase CI function)</li>
+	<li><a href="https://www.codeigniter.com/user_guide/helpers/text_helper.html#word_limiter" target="_blank">{string}_excerpt</a> (word_limiter CI function)</li>
+	<li><a href="https://www.codeigniter.com/user_guide/helpers/text_helper.html#ellipsize" target="_blank">{string}_ellipsize</a> (ellipsize CI function)</li>
+	<li><a href="https://www.codeigniter.com/user_guide/helpers/text_helper.html#highlight_phrase" target="_blank">{string}_highlight</a> (highlight_phrase CI function)</li>
 	<li><a href="http://us2.php.net/manual/en/function.htmlentities.php" target="_blank">{string}_entities</a></li>
 	<li><a href="http://us2.php.net/manual/en/function.htmlspecialchars.php" target="_blank">{string}_specialchars</a></li>
-	<li><a href="http://ellislab.com/codeigniter/user-guide/helpers/inflector_helper.html" target="_blank">{string}_humanize</a> (humanize CI function)</li>
-	<li><a href="http://ellislab.com/codeigniter/user-guide/helpers/inflector_helper.html" target="_blank">{string}_underscore</a> (underscore CI function)</li>
-	<li><a href="http://ellislab.com/codeigniter/user-guide/helpers/inflector_helper.html" target="_blank">{string}_camelize</a> (camelize CI function)</li>
+	<li><a href="https://www.codeigniter.com/user_guide/helpers/inflector_helper.html#humanize" target="_blank">{string}_humanize</a> (humanize CI function)</li>
+	<li><a href="https://www.codeigniter.com/user_guide/helpers/inflector_helper.html#underscore" target="_blank">{string}_underscore</a> (underscore CI function)</li>
+	<li><a href="https://www.codeigniter.com/user_guide/helpers/inflector_helper.html#camelize" target="_blank">{string}_camelize</a> (camelize CI function)</li>
 </ul>
 
 <h3>Number Examples</h3>
@@ -666,8 +666,8 @@ function __construct()
 <h3>Special Field Name Examples</h3>
 <p>Below are examples of formatters that can be applied to a number type fields (tinyint, smallint, int, bigint) and links to the functions that they use.</p>
 <ul>
-	<li><a href="http://ellislab.com/codeigniter/user-guide/helpers/url_helper.html" target="_blank">{url|link}_path</a> (site_url CI function)</li>
-	<li><a href="http://ellislab.com/codeigniter/user-guide/helpers/url_helper.html" target="_blank">{url|link}_prep</a> (prep_url CI function)</li>
+	<li><a href="https://www.codeigniter.com/user_guide/helpers/url_helper.html#site_url" target="_blank">{url|link}_path</a> (site_url CI function)</li>
+	<li><a href="https://www.codeigniter.com/user_guide/helpers/url_helper.html#prep_url" target="_blank">{url|link}_prep</a> (prep_url CI function)</li>
 	<li><a href="<?=user_guide_url('helpers/asset_helper#func_assets_path')?>">{img|image|thumb|pdf}_path</a></li>
 	<li><a href="<?=user_guide_url('helpers/asset_helper#func_assets_server_path')?>">{img|image|thumb|pdf}_serverpath</a></li>
 	<li><a href="<?=user_guide_url('helpers/asset_helper#func_asset_filesize')?>">{img|image|thumb|pdf}_filesize</a></li>
diff --git a/fuel/modules/fuel/views/_docs/general/redirects.php b/fuel/modules/fuel/views/_docs/general/redirects.php
index 19d6ed4b0..12544b770 100644
--- a/fuel/modules/fuel/views/_docs/general/redirects.php
+++ b/fuel/modules/fuel/views/_docs/general/redirects.php
@@ -22,7 +22,7 @@
 									);
 </pre>
 
-<p class="important">Key values can use regular expression syntax similar to <a href="http://ellislab.com/codeigniter/user-guide/general/routing.html" target="_blank">routes</a>.</p>
+<p class="important">Key values can use regular expression syntax similar to <a href="https://www.codeigniter.com/user_guide/general/routing.html" target="_blank">routes</a>.</p>
 
 <br />
 
diff --git a/fuel/modules/fuel/views/_docs/general/security.php b/fuel/modules/fuel/views/_docs/general/security.php
index b5ce85e73..c44f2cf65 100644
--- a/fuel/modules/fuel/views/_docs/general/security.php
+++ b/fuel/modules/fuel/views/_docs/general/security.php
@@ -19,7 +19,7 @@
 <p>Additionally, the following module specific security settings exist:</p>
 <ul>
 	<li><strong>sanitize_input</strong> - cleans the input before inserting or updating the data source. 
-		A value of <dfn>TRUE</dfn>, will apply the <a href="http://ellislab.com/codeigniter/user-guide/helpers/security_helper.html" target="_blank">xss_clean</a> function. 
+		A value of <dfn>TRUE</dfn>, will apply the <a href="https://www.codeigniter.com/user_guide/helpers/security_helper.html#xss_clean" target="_blank">xss_clean</a> function.
 		A value of <dfn>FALSE</dfn>, will apply no sanitation functions.
 		You can use an array to apply more than one function to sanitize your input.
 		The list of functions to sanitize the input is set by the <dfn>module_sanitize_funcs</dfn> <a href="<?=user_guide_url('installation/configuration')?>">FUEL configuration</a> value under the security settings.
@@ -30,6 +30,6 @@
 			<li><strong>template</strong> = php_to_template_syntax</li>
 			<li><strong>entities</strong> = entities</li>
 		</ul>
-	<li><strong>sanitize_files</strong> (was sanitize_images) - uses <a href="http://ellislab.com/codeigniter/user-guide/helpers/security_helper.html" target="_blank">xss_clean</a> function on images.</li>
+	<li><strong>sanitize_files</strong> (was sanitize_images) - uses <a href="https://www.codeigniter.com/user_guide/helpers/security_helper.html#xss_clean" target="_blank">xss_clean</a> function on images.</li>
 </ul>
 
diff --git a/fuel/modules/fuel/views/_docs/general/template-parsing.php b/fuel/modules/fuel/views/_docs/general/template-parsing.php
index e082526bd..a3f091cc5 100644
--- a/fuel/modules/fuel/views/_docs/general/template-parsing.php
+++ b/fuel/modules/fuel/views/_docs/general/template-parsing.php
@@ -62,9 +62,9 @@
 	<li>{swf_path('my_swf.swf')} - Maps to the <a href="<?=user_guide_url('helpers/asset_helper#func_swf_path')?>">swf_path()</a> function. The <dfn>.swf</dfn> extension is optional.</li>
 	<li>{media_path('my_movie.mov')} - Maps to the <a href="<?=user_guide_url('helpers/asset_helper#func_media_path')?>">media_path()</a> function.</li>
 	<li>{pdf_path('my_pdf.pdf')} - Maps to the <a href="<?=user_guide_url('helpers/asset_helper#func_pdf_path')?>">pdf_path()</a> function. The <dfn>.pdf</dfn> extension is optional.</li>
-	<li>{safe_mailto('my@email.com', 'text')} - Maps to the  <a href="http://ellislab.com/codeigniter/user-guide/helpers/url_helper.html" target="_blank">safe_mailto()</a> function.</li>
-	<li>{redirect('my_redirect_page')} - Maps to the <a href="http://ellislab.com/codeigniter/user-guide/helpers/url_helper.html" target="_blank">redirect()</a> function.</li>
-	<li>{show_404} - Maps to the <a href="http://ellislab.com/codeigniter/user-guide/general/errors.html" target="_blank">show_404()</a> function.</li>
+	<li>{safe_mailto('my@email.com', 'text')} - Maps to the  <a href="https://www.codeigniter.com/user_guide/helpers/url_helper.html#safe_mailto" target="_blank">safe_mailto()</a> function.</li>
+	<li>{redirect('my_redirect_page')} - Maps to the <a href="https://www.codeigniter.com/user_guide/helpers/url_helper.html#redirect" target="_blank">redirect()</a> function.</li>
+	<li>{show_404} - Maps to the <a href="https://www.codeigniter.com/user_guide/general/errors.html#show_404" target="_blank">show_404()</a> function.</li>
 </ul>
 
 <h3>Namespaced Functions</h3>
diff --git a/fuel/modules/fuel/views/_docs/general/views.php b/fuel/modules/fuel/views/_docs/general/views.php
index c7bf16818..6e8beb216 100644
--- a/fuel/modules/fuel/views/_docs/general/views.php
+++ b/fuel/modules/fuel/views/_docs/general/views.php
@@ -1,5 +1,5 @@
 <h1>Views</h1>
-<p>Views within FUEL work just like <a href="http://ellislab.com/codeigniter/user-guide/general/views.html" target="_blank">CodeIgniter views</a> but with some extra functionality. 
+<p>Views within FUEL work just like <a href="https://www.codeigniter.com/user_guide/general/views.html" target="_blank">CodeIgniter views</a> but with some extra functionality.
 For example, you can render a page automatically without creating a controller method by using the <a href="<?=user_guide_url('general/opt-in-controllers')?>">opt-in controller method</a>.</p>
 
 <h2>Hiding Views</h2>
diff --git a/fuel/modules/fuel/views/_docs/installation/db-setup.php b/fuel/modules/fuel/views/_docs/installation/db-setup.php
index 7ca783af6..464bc2e3d 100644
--- a/fuel/modules/fuel/views/_docs/installation/db-setup.php
+++ b/fuel/modules/fuel/views/_docs/installation/db-setup.php
@@ -1,2 +1,2 @@
 <h1>Setting Up the Database</h1>
-<p>FUEL uses a MySQL database (it has not been testing on other databases). It uses the standard <a href="http://ellislab.com/codeigniter/user-guide/database/configuration.html" target="_blank">CodeIgniter database config</a>.</p>
\ No newline at end of file
+<p>FUEL uses a MySQL database (it has not been testing on other databases). It uses the standard <a href="https://www.codeigniter.com/user_guide/database/configuration.html" target="_blank">CodeIgniter database config</a>.</p>
\ No newline at end of file
diff --git a/fuel/modules/fuel/views/_docs/installation/troubleshooting.php b/fuel/modules/fuel/views/_docs/installation/troubleshooting.php
index aff948812..21cd3a579 100644
--- a/fuel/modules/fuel/views/_docs/installation/troubleshooting.php
+++ b/fuel/modules/fuel/views/_docs/installation/troubleshooting.php
@@ -4,9 +4,9 @@
 
 <h2 id="codeignter">CodeIgniter</h2>
 <ul>
-	<li><a href="http://ellislab.com/codeigniter/user-guide/installation/troubleshooting.html" target="_blank">CodeIgniter Troubleshooting page</a></li>
-	<li><a href="http://ellislab.com/codeigniter/user-guide/" target="_blank">CodeIgniter User Guide</a></li>
-	<li><a href="https://ellislab.com/forums/" target="_blank">CodeIgniter Forums</a></li>
+	<li><a href="https://www.codeigniter.com/user_guide/installation/troubleshooting.html" target="_blank">CodeIgniter Troubleshooting page</a></li>
+	<li><a href="https://www.codeigniter.com/user_guide/" target="_blank">CodeIgniter User Guide</a></li>
+	<li><a href="https://forum.codeigniter.com/" target="_blank">CodeIgniter Forums</a></li>
 </ul>
 
 <h2 id="fuel-cms">FUEL CMS</h2>
diff --git a/fuel/modules/fuel/views/_docs/introduction/what-is-fuel.php b/fuel/modules/fuel/views/_docs/introduction/what-is-fuel.php
index 1dce26c6e..69b262fb1 100644
--- a/fuel/modules/fuel/views/_docs/introduction/what-is-fuel.php
+++ b/fuel/modules/fuel/views/_docs/introduction/what-is-fuel.php
@@ -4,7 +4,7 @@
 only use the CMS part when and if you need it. It's a hybrid of a framework and a CMS.</p>
 
 <p>FUEL CMS evolved out of the need for having a development platform that
-was a framework first and a CMS second. <a href="http://ellislab.com/codeigniter" target="_blank">CodeIgniter</a> was chosen as the framework because it is
+was a framework first and a CMS second. <a href="https://www.codeigniter.com/" target="_blank">CodeIgniter</a> was chosen as the framework because it is
 a popular, well-documented, lightweight, PHP framework and allows you to cleanly structure your code
 using MVC principles.
 </p>
diff --git a/fuel/modules/fuel/views/_docs/libraries/cache.php b/fuel/modules/fuel/views/_docs/libraries/cache.php
index 908a94d4d..55e7669b0 100644
--- a/fuel/modules/fuel/views/_docs/libraries/cache.php
+++ b/fuel/modules/fuel/views/_docs/libraries/cache.php
@@ -2,4 +2,4 @@
 <p>The Cache library used by FUEL, 
 was developed by Al James
 and allows for greater control of caching files beyond CodeIgniter's 
-<a href="http://ellislab.com/codeigniter/user-guide/general/caching.html" target="_blank">Caching class</a>.</p>
\ No newline at end of file
+<a href="https://www.codeigniter.com/user_guide/general/caching.html" target="_blank">Caching class</a>.</p>
\ No newline at end of file
diff --git a/fuel/modules/fuel/views/_docs/libraries/my_hooks.php b/fuel/modules/fuel/views/_docs/libraries/my_hooks.php
index 20bffef3b..333f026bd 100644
--- a/fuel/modules/fuel/views/_docs/libraries/my_hooks.php
+++ b/fuel/modules/fuel/views/_docs/libraries/my_hooks.php
@@ -1,3 +1,3 @@
 <h1>MY_Hooks Class</h1>
-<p>The MY_Hooks class extends the native CI <a href="http://ellislab.com/codeigniter/user-guide/general/hooks.html" target="_blank">Hooks class</a> so that we could include the module name in the configuration as well
+<p>The MY_Hooks class extends the native CI <a href="https://www.codeigniter.com/user_guide/general/hooks.html" target="_blank">Hooks class</a> so that we could include the module name in the configuration as well
 as pass additional parameter when calling the hook.</p>
\ No newline at end of file
diff --git a/fuel/modules/fuel/views/_docs/libraries/my_image_lib.php b/fuel/modules/fuel/views/_docs/libraries/my_image_lib.php
index 10815bbee..758fe6338 100644
--- a/fuel/modules/fuel/views/_docs/libraries/my_image_lib.php
+++ b/fuel/modules/fuel/views/_docs/libraries/my_image_lib.php
@@ -1,5 +1,5 @@
 <h1>MY_Image_lib Class</h1>
-<p>The <dfn>MY_Image_lib Class</dfn> extends <a href="http://ellislab.com/codeigniter/user-guide/libraries/image_lib.html" target="_blank">CI_Image_lib</a> result class.
+<p>The <dfn>MY_Image_lib Class</dfn> extends <a href="https://www.codeigniter.com/user_guide/libraries/image_lib.html" target="_blank">CI_Image_lib</a> result class.
 It adds a couple methods listed below:
 </p>
 
diff --git a/fuel/modules/fuel/views/_docs/modules.php b/fuel/modules/fuel/views/_docs/modules.php
index b503a5f9e..7803dcf5f 100644
--- a/fuel/modules/fuel/views/_docs/modules.php
+++ b/fuel/modules/fuel/views/_docs/modules.php
@@ -99,5 +99,5 @@
 $config['repo'] = 'git://github.com/daylightstudio/FUEL-CMS-Blog-Module.git';
 </pre>
 
-<p class="important">Note that you can use <a href="http://ellislab.com/codeigniter/user-guide/libraries/migration.html" target="_blank">CodeIgniter's migrations</a> for managing SQL versioning as an
+<p class="important">Note that you can use <a href="https://www.codeigniter.com/user_guide/libraries/migration.html" target="_blank">CodeIgniter's migrations</a> for managing SQL versioning as an
 alternative to using install_sql and uninstall_sql parameters.</p>
diff --git a/fuel/modules/fuel/views/_docs/modules/generate.php b/fuel/modules/fuel/views/_docs/modules/generate.php
index 63c148f4e..cc5169aac 100644
--- a/fuel/modules/fuel/views/_docs/modules/generate.php
+++ b/fuel/modules/fuel/views/_docs/modules/generate.php
@@ -1,7 +1,7 @@
 <h1>Generate</h1>
 <p>FUEL CMS provides a command line tool to help you auto generate starter files for your simple and advanced modules. To do so, navigate 
 to the folder (e.g. using "cd") where the main bootstrap index.php file exists. Then you can type the commands below which use the
-<a href="http://ellislab.com/codeigniter/user-guide/general/cli.html" target="_blank">CodeIgniter CLI</a> to generate files automatically.</p>
+<a href="https://www.codeigniter.com/user_guide/general/cli.html" target="_blank">CodeIgniter CLI</a> to generate files automatically.</p>
 
 <h2 id="configuration">Configuration and Templates</h2>
 <p>The default generated template files exist in the <span class="file">fuel/modules/fuel/views/_generated/{type}</span> folder where <dfn>{type}</dfn>
diff --git a/fuel/modules/fuel/views/_docs/modules/hooks.php b/fuel/modules/fuel/views/_docs/modules/hooks.php
index c88987c97..bda3ad8bf 100644
--- a/fuel/modules/fuel/views/_docs/modules/hooks.php
+++ b/fuel/modules/fuel/views/_docs/modules/hooks.php
@@ -1,8 +1,8 @@
 <h1>Module Hooks</h1>
-<p>FUEL has extended the <a href="http://ellislab.com/codeigniter/user-guide/general/hooks.html" target="_blank">CodeIgniter Hooks</a> system to provide 
+<p>FUEL has extended the <a href="https://www.codeigniter.com/user_guide/general/hooks.html" target="_blank">CodeIgniter Hooks</a> system to provide
 extra hooks into creating, editing, and deleting of simple module data. An additional <dfn>module</dfn> hook parameter was added to allow you to add hook files
 in your advanced module folders (e.g. <dfn>fuel/modules/my_module/hooks</dfn>). To add a hook, you modify the <dfn>fuel/application/config/hooks.php</dfn>
-just like the native <a href="http://ellislab.com/codeigniter/user-guide/general/hooks.html" target="_blank">CodeIgniter Hooks</a>.</p>
+just like the native <a href="https://www.codeigniter.com/user_guide/general/hooks.html" target="_blank">CodeIgniter Hooks</a>.</p>
 
 <p>The hooks currently available are:</p>
 <ul>
diff --git a/fuel/modules/fuel/views/_docs/modules/simple.php b/fuel/modules/fuel/views/_docs/modules/simple.php
index ada0e0813..4a773e3b5 100644
--- a/fuel/modules/fuel/views/_docs/modules/simple.php
+++ b/fuel/modules/fuel/views/_docs/modules/simple.php
@@ -46,7 +46,7 @@
 		</tr>
 		<tr>
 			<td><strong>module_name</strong></td>
-			<td>The default value is a <a href="http://ellislab.com/codeigniter/user-guide/helpers/inflector_helper.html" target="_blank">humanized</a> version of the module key (e.g. a key of example = Example)</td>
+			<td>The default value is a <a href="https://www.codeigniter.com/user_guide/helpers/inflector_helper.html" target="_blank">humanized</a> version of the module key (e.g. a key of example = Example)</td>
 			<td>None</td>
 			<td>the friendly name of the module.</td>
 		</tr>
diff --git a/fuel/modules/fuel/views/_docs/modules/tutorial.php b/fuel/modules/fuel/views/_docs/modules/tutorial.php
index ed40cf45c..f373e6e27 100644
--- a/fuel/modules/fuel/views/_docs/modules/tutorial.php
+++ b/fuel/modules/fuel/views/_docs/modules/tutorial.php
@@ -257,7 +257,7 @@ class Article_model extends Base_module_record {
     second field in your table, so in our case, we really don't need to specify this value since "title" is the second field in our table but we do so 
     for demonstration purposes.</li>
     <li><strong>sanitize_input</strong>: The <dfn>sanitize_input</dfn> parameter is used to clean input before it gets inserted into the database table.
-    The default value is <var>TRUE</var> which means it will apply the <a href="http://ellislab.com/codeigniter/user-guide/helpers/security_helper.html" target="_blank">xss_clean</a> 
+    The default value is <var>TRUE</var> which means it will apply the <a href="https://www.codeigniter.com/user_guide/helpers/security_helper.html" target="_blank">xss_clean</a>
     function. In some cases, this default value is too restrictive and will not allow you to input javascript or iframe code. So instead, you 
     can specify an array of options that are available from FUEL's <a href="<?=user_guide_url('installation/configuration')?>">module_sanitize_funcs</a> config parameter. In this case, we will use
     the <var>template</var> and <var>php</var> value that maps to FUEL's <a href="<?=user_guide_url('helpers/my_string_helper#func_php_to_template_syntax')?>">php_to_template_syntax</a> and <a href="http://php.net/manual/en/function.htmlentities.php" target="_blank">htmlentities</a> function respectively.</li>

From fbf68eda9614db2a09b91b2b3bb95ddc2cc2b5e1 Mon Sep 17 00:00:00 2001
From: Martynas Sateika <martynas.sateika@gmail.com>
Date: Thu, 30 Aug 2018 00:37:55 +0100
Subject: [PATCH 089/129] Fix incorrect link to CodeIgniter's file_helper page

---
 fuel/modules/fuel/views/_docs/general/configs-settings.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fuel/modules/fuel/views/_docs/general/configs-settings.php b/fuel/modules/fuel/views/_docs/general/configs-settings.php
index 5e9b25800..c2e5d743a 100644
--- a/fuel/modules/fuel/views/_docs/general/configs-settings.php
+++ b/fuel/modules/fuel/views/_docs/general/configs-settings.php
@@ -59,7 +59,7 @@
 	<li><strong>hooks:</strong> the <a href="https://www.codeigniter.com/user_guide/general/hooks.html" target="_blank">CodeIgniter Hooks</a> configuration. By default it includes the <span class="file">fuel/modules/fuel/config/fuel_hooks.php</span>
 		file which contains FUEL specific hooks. </li>
 	<li><strong>migration:</strong> the <a href="https://www.codeigniter.com/user_guide/libraries/migration.html" target="_blank">CodeIgniter Migration</a> configuration. </li>
-	<li><strong>mimes:</strong> the <a href="https://www.codeigniter.com/user_guide/libraries/migration.html" target="_blank">CodeIgniter mimes</a> configuration used by such classes
+	<li><strong>mimes:</strong> the <a href="https://www.codeigniter.com/user_guide/helpers/file_helper.html#get_mime_by_extension" target="_blank">CodeIgniter mimes</a> configuration used by such classes
 			as the CodeIgniter <a href="https://www.codeigniter.com/user_guide/libraries/output.html" target="_blank">Output class</a>, the <a href="https://www.codeigniter.com/user_guide/libraries/file_uploading.html" target="_blank">Upload class</a>,
 			the <a href="https://www.codeigniter.com/user_guide/helpers/file_helper.html" target="_blank">file helper</a> and the <a href="https://www.codeigniter.com/user_guide/helpers/download_helper.html" target="_blank">download helper</a>.</li>
 	<li><strong>routes:</strong> the <a href="https://www.codeigniter.com/user_guide/general/routing.html" target="_blank">CodeIgniter Routing</a> configuration</li>

From 5b058a6edf5a754b004541482ddca6b80d0c2a0d Mon Sep 17 00:00:00 2001
From: Martynas Sateika <martynas.sateika@gmail.com>
Date: Thu, 30 Aug 2018 01:35:33 +0100
Subject: [PATCH 090/129] Fix incorrect link to FUEL's form_builder library
 documentation

---
 fuel/modules/fuel/libraries/Fuel_custom_fields.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fuel/modules/fuel/libraries/Fuel_custom_fields.php b/fuel/modules/fuel/libraries/Fuel_custom_fields.php
index 9bb7abefd..2e10f36f2 100644
--- a/fuel/modules/fuel/libraries/Fuel_custom_fields.php
+++ b/fuel/modules/fuel/libraries/Fuel_custom_fields.php
@@ -22,7 +22,7 @@
  * @subpackage	Libraries
  * @category	Libraries
  * @author		David McReynolds @ Daylight Studio
- * @link		http://docs.getfuelcms.com/library/form_builder
+ * @link		http://docs.getfuelcms.com/libraries/form_builder
  * @autodoc		FALSE
  */
 

From 3bc1d2b21f6b3caab641d0e69c48ee60c496a9e7 Mon Sep 17 00:00:00 2001
From: Martynas Sateika <martynas.sateika@gmail.com>
Date: Tue, 4 Sep 2018 21:43:15 +0100
Subject: [PATCH 091/129] Force use of 'filter_var' (introduced in PHP 5.2.0)
 in Validator helper

---
 fuel/modules/fuel/helpers/validator_helper.php | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/fuel/modules/fuel/helpers/validator_helper.php b/fuel/modules/fuel/helpers/validator_helper.php
index 8f3343c00..69dd771fb 100644
--- a/fuel/modules/fuel/helpers/validator_helper.php
+++ b/fuel/modules/fuel/helpers/validator_helper.php
@@ -122,14 +122,7 @@ function has_one_of_these($args = null)
 	 */
 	function valid_email($email)
 	{
-		if (function_exists('filter_var'))
-		{
-			return filter_var($email, FILTER_VALIDATE_EMAIL);
-		}
-		else
-		{
-			return ( ! preg_match("/^([a-z0-9\+_\-]+)(\.[a-z0-9\+_\-]+)*@([a-z0-9\-]+\.)+[a-z]{2,10}$/ix", $email)) ? FALSE : TRUE;
-		}
+        return filter_var($email, FILTER_VALIDATE_EMAIL);
 	}
 } 
 

From ddb0b569c68e5c12c5d26836d0437c5dffd62d2a Mon Sep 17 00:00:00 2001
From: Martynas Sateika <martynas.sateika@gmail.com>
Date: Tue, 4 Sep 2018 22:12:07 +0100
Subject: [PATCH 092/129] Add unit tests for is_outside, including failing
 tests

---
 .../fuel/tests/Validator_helper_test.php      | 91 +++++++++++++++++++
 1 file changed, 91 insertions(+)
 create mode 100644 fuel/modules/fuel/tests/Validator_helper_test.php

diff --git a/fuel/modules/fuel/tests/Validator_helper_test.php b/fuel/modules/fuel/tests/Validator_helper_test.php
new file mode 100644
index 000000000..6576791bb
--- /dev/null
+++ b/fuel/modules/fuel/tests/Validator_helper_test.php
@@ -0,0 +1,91 @@
+<?php  if (!defined('BASEPATH')) exit('No direct script access allowed');
+
+require_once('Fuel_test_base.php');
+
+/**
+ * FUEL CMS
+ * http://www.getfuelcms.com
+ *
+ * An open source Content Management System based on the
+ * Codeigniter framework (http://codeigniter.com)
+ *
+ * @package		FUEL CMS
+ * @author		David McReynolds @ Daylight Studio
+ * @copyright	Copyright (c) 2018, Daylight Studio LLC.
+ * @license		http://docs.getfuelcms.com/general/license
+ * @link		http://www.getfuelcms.com
+ * @filesource
+ */
+
+// ------------------------------------------------------------------------
+
+/**
+ * FUEL Validator Helper Test
+ *
+ * @package		FUEL CMS
+ * @subpackage	Helpers
+ * @category	Helpers
+ * @author		David McReynolds @ Daylight Studio
+ * @link		http://docs.getfuelcms.com/helpers/validator_helper
+ */
+
+// ------------------------------------------------------------------------
+
+class Validator_helper_test extends Tester_base
+{
+
+    public function setup()
+    {
+        parent::setup();
+        $this->CI->load->helper('validator');
+    }
+
+    // ------------------------------------------------------------------------
+
+    public function test_is_outside_below_lower_limit()
+    {
+        $actual = is_outside(0, 1, 3);
+        $expected = TRUE;
+        $this->run($actual, $expected, 'is_outside: below lower limit');
+    }
+
+    // ------------------------------------------------------------------------
+
+    public function test_is_outside_equals_lower_limit()
+    {
+        $actual = is_outside(1, 1, 3);
+        $expected = FALSE;
+        $this->run($actual, $expected, 'is_outside: equals lower limit');
+    }
+
+    // ------------------------------------------------------------------------
+
+    public function test_is_outside_between_lower_and_upper_limit()
+    {
+        $actual = is_outside(2, 1, 3);
+        $expected = FALSE;
+        $this->run($actual, $expected, 'is_outside: between lower and upper limit');
+    }
+
+    // ------------------------------------------------------------------------
+
+    public function test_is_outside_equals_upper_limit()
+    {
+        $actual = is_outside(3, 1, 3);
+        $expected = FALSE;
+        $this->run($actual, $expected, 'is_outside: equals upper limit');
+    }
+
+    // ------------------------------------------------------------------------
+
+    public function test_is_outside_above_upper_limit()
+    {
+        $actual = is_outside(4, 1, 3);
+        $expected = TRUE;
+        $this->run($actual, $expected, 'is_outside: above upper limit');
+    }
+
+}
+
+/* End of file Validator_helper_test.php */
+/* Location: ./modules/fuel/tests/Validator_helper_test.php */

From 82503f36cbb88144ca61e917fad705da6db9b8c0 Mon Sep 17 00:00:00 2001
From: Martynas Sateika <martynas.sateika@gmail.com>
Date: Tue, 4 Sep 2018 22:14:21 +0100
Subject: [PATCH 093/129] Alter range check in 'is_outside' function

---
 fuel/modules/fuel/helpers/validator_helper.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/fuel/modules/fuel/helpers/validator_helper.php b/fuel/modules/fuel/helpers/validator_helper.php
index 8f3343c00..103fda163 100644
--- a/fuel/modules/fuel/helpers/validator_helper.php
+++ b/fuel/modules/fuel/helpers/validator_helper.php
@@ -215,11 +215,7 @@ function is_between($var, $lo, $hi)
 	 */
 	function is_outside($var, $lo, $hi)
 	{
-		if($var >= $hi AND $var <= $lo)
-		{
-			return TRUE;
-		}
-		return FALSE;
+		return $var < $lo || $var > $hi;
 	}
 }
 

From 9c9715a61d0302b702b184d92423c47ffb1d3a26 Mon Sep 17 00:00:00 2001
From: Martynas Sateika <martynas.sateika@gmail.com>
Date: Tue, 4 Sep 2018 22:38:07 +0100
Subject: [PATCH 094/129] Fix broken 'to_json' test in 'My_model_test'

---
 fuel/modules/fuel/tests/My_model_test.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fuel/modules/fuel/tests/My_model_test.php b/fuel/modules/fuel/tests/My_model_test.php
index 86f63b96b..6660fa9eb 100755
--- a/fuel/modules/fuel/tests/My_model_test.php
+++ b/fuel/modules/fuel/tests/My_model_test.php
@@ -26,7 +26,7 @@ public function test_json()
 		$record = $test_custom_records_model->find_one(array('email' => 'dave@thedaylightstudio.com'));
 
 		$test = $record->to_json();
-		$expected = '{"id":"2","user_name":"dave","password":"21232f297a57a5a743894a0e4a801fc3","email":"dave@thedaylightstudio.com","first_name":"Dave","last_name":"McReynolds","bio":"Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.","role_id":"2","attributes":"","active":"yes","date_added":"2012-01-01 00:00:00","full_name":"Dave McReynolds"}';
+		$expected = '{"id":2,"user_name":"dave","password":"21232f297a57a5a743894a0e4a801fc3","email":"dave@thedaylightstudio.com","first_name":"Dave","last_name":"McReynolds","bio":"Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.","role_id":2,"attributes":"","active":"yes","date_added":"2012-01-01 00:00:00","full_name":"Dave McReynolds"}';
 		$this->run($test, $expected, 'to_json custom record object test');
 	}
 

From 84666cc619c8a572bef5edf137ac2ffaeb4de7e0 Mon Sep 17 00:00:00 2001
From: Martynas Sateika <martynas.sateika@gmail.com>
Date: Tue, 4 Sep 2018 23:07:21 +0100
Subject: [PATCH 095/129] Unit test My Html Helper

---
 .../fuel/tests/My_html_helper_test.php        | 141 ++++++++++++++++++
 1 file changed, 141 insertions(+)
 create mode 100644 fuel/modules/fuel/tests/My_html_helper_test.php

diff --git a/fuel/modules/fuel/tests/My_html_helper_test.php b/fuel/modules/fuel/tests/My_html_helper_test.php
new file mode 100644
index 000000000..4dca80bf0
--- /dev/null
+++ b/fuel/modules/fuel/tests/My_html_helper_test.php
@@ -0,0 +1,141 @@
+<?php  if (!defined('BASEPATH')) exit('No direct script access allowed');
+
+require_once('Fuel_test_base.php');
+
+/**
+ * FUEL CMS
+ * http://www.getfuelcms.com
+ *
+ * An open source Content Management System based on the
+ * Codeigniter framework (http://codeigniter.com)
+ *
+ * @package		FUEL CMS
+ * @author		David McReynolds @ Daylight Studio
+ * @copyright	Copyright (c) 2018, Daylight Studio LLC.
+ * @license		http://docs.getfuelcms.com/general/license
+ * @link		http://www.getfuelcms.com
+ * @filesource
+ */
+
+// ------------------------------------------------------------------------
+
+/**
+ * FUEL My Html Helper Test
+ *
+ * @package		FUEL CMS
+ * @subpackage	Helpers
+ * @category	Helpers
+ * @author		David McReynolds @ Daylight Studio
+ * @link		http://docs.getfuelcms.com/helpers/my_html_helper
+ */
+
+// ------------------------------------------------------------------------
+
+class My_html_helper_test extends Tester_base
+{
+
+    public function setup()
+    {
+        parent::setup();
+        $this->CI->load->helper('my_html');
+    }
+
+    // ------------------------------------------------------------------------
+
+    public function test_tag_with_no_values()
+    {
+        $actual = tag('foo', array());
+        $expected = '';
+        $this->run($actual, $expected, 'tag with no values');
+    }
+
+    // ------------------------------------------------------------------------
+
+    public function test_tag_with_single_value()
+    {
+        $actual = tag('foo', 'bar');
+        $expected = '<foo>bar</foo>';
+        $this->run($actual, $expected, 'tag with single value');
+    }
+
+    // ------------------------------------------------------------------------
+
+    public function test_tag_with_single_attribute()
+    {
+        $actual = tag('foo', 'bar', 'class="baz"');
+        $expected = '<foo class="baz">bar</foo>';
+        $this->run($actual, $expected, 'tag with single attribute');
+    }
+
+    // ------------------------------------------------------------------------
+
+    public function test_tag_with_empty_attribute()
+    {
+        $actual = tag('foo', 'bar', '');
+        $expected = '<foo>bar</foo>';
+        $this->run($actual, $expected, 'tag with empty attribute');
+    }
+
+    // ------------------------------------------------------------------------
+
+    public function test_tag_multiple_values()
+    {
+        $actual = tag('foo', array('bar', 'baz'));
+        $actual = strip_whitespace($actual);
+        $expected = '<foo>bar</foo><foo>baz</foo>';
+        $this->run($actual, $expected, 'tag with multiple values');
+    }
+
+    // ------------------------------------------------------------------------
+
+    public function test_html_attrs_empty_array()
+    {
+        $actual = html_attrs(array());
+        $expected = '';
+        $this->run($actual, $expected, 'html_attrs with empty attributes array');
+    }
+
+    // ------------------------------------------------------------------------
+
+    public function test_html_attrs_one_attribute_in_array()
+    {
+        $actual = html_attrs(array('foo' => 'bar'));
+        $expected = ' foo="bar"';
+        $this->run($actual, $expected, 'html_attrs with one attribute in array');
+    }
+
+    // ------------------------------------------------------------------------
+
+    public function test_html_attrs_multiple_attributes_in_array()
+    {
+        $actual = html_attrs(array('foo' => 'bar', 'baz' => 'qux'));
+        $expected = ' foo="bar" baz="qux"';
+        $this->run($actual, $expected, 'html_attrs with multiple attributes in array');
+    }
+
+    // ------------------------------------------------------------------------
+
+    public function test_html_attrs_data_attribute_in_array()
+    {
+        $actual = html_attrs(array('data' => array('foo' => 'bar')));
+        $expected = ' data-foo="bar"';
+        $this->run($actual, $expected, 'html_attrs with data attribute in array');
+    }
+
+    // ------------------------------------------------------------------------
+
+    public function test_html_attrs_mix_of_data_and_non_data_attributes_in_array()
+    {
+        $actual = html_attrs(array(
+            'foo' => 'bar',
+            'data' => array('baz' => 'qux', 'quux' => 'quuz'),
+            'corge' => 'grault'
+        ));
+        $expected = ' foo="bar" data-baz="qux" data-quux="quuz" corge="grault"';
+        $this->run($actual, $expected, 'html_attrs with data attribute in array');
+    }
+
+}
+
+/* End of file My_html_helper_test.php */
+/* Location: ./modules/fuel/tests/My_html_helper_test.php */

From ed337694407b91d00772bf5098ee1799ccf80d93 Mon Sep 17 00:00:00 2001
From: David McReynolds <dave@thedaylightstudio.com>
Date: Tue, 4 Sep 2018 21:50:07 -0700
Subject: [PATCH 096/129] Fix for issue #492

---
 fuel/modules/fuel/libraries/Data_table.php | 28 +++++++---------------
 1 file changed, 9 insertions(+), 19 deletions(-)

diff --git a/fuel/modules/fuel/libraries/Data_table.php b/fuel/modules/fuel/libraries/Data_table.php
index ac9119821..aec2d2d56 100644
--- a/fuel/modules/fuel/libraries/Data_table.php
+++ b/fuel/modules/fuel/libraries/Data_table.php
@@ -796,19 +796,15 @@ public function add_row($columns = array(), $attrs = array(), $index = NULL, $ac
 				if (empty($action)) $action = $this->default_field_action;
 				if (!empty($action))
 				{
+					$callback = function($match) use ($columns) {
+						$return = $match[0];
+						if (!empty($match[2]))
+						{
+							$return = $match[1].$columns[$match[2]].$match[3];
+						}
+						return $return;
+					};
 
-					//e modifier is deprecated so we have to do this
-					$callback = function($match){
-							$return = $match[0];
-							if (!empty($match[2]))
-							{
-								$return = $match[1].$GLOBALS["__tmp_transient_columns__"][$match[2]].$match[3];
-							}
-							return $return;
-						};
-
-					// hacky but avoids 5.3 function syntax (which is nicer but doesn't work with 5.2)
-					$GLOBALS['__tmp_transient_columns__'] = $columns;
 					$action = preg_replace_callback('#^(.*)\{(.+)\}(.*)$#', $callback, $action);
 					$fields[] = new Data_table_field($key, $val, array(), $action);
 				}
@@ -824,14 +820,8 @@ public function add_row($columns = array(), $attrs = array(), $index = NULL, $ac
 					$i++;
 				}
 			}
-
-			// hacky cleanup to avoid using 5.3 syntax
-			if (isset($GLOBALS["__tmp_transient_columns__"]))
-			{
-				unset($GLOBALS["__tmp_transient_columns__"]);
-			}
-
 		}
+		
 		$attrs['id'] = (!empty($columns[$this->row_id_key])) ? $this->id.'_row'.$columns[$this->row_id_key] : $this->id.'_row'.$index;
 		$this->rows[$index] = new Data_table_row($fields, $attrs, $col_attrs);
 		return $this->rows[$index];

From dd94d21569b39895d41c722c6e84f7320a4502af Mon Sep 17 00:00:00 2001
From: Martynas Sateika <martynas.sateika@gmail.com>
Date: Thu, 6 Sep 2018 21:18:57 +0100
Subject: [PATCH 097/129] Remove unnecessary second parameter from
 'highlight_code' call

---
 fuel/modules/fuel/libraries/MY_Profiler.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fuel/modules/fuel/libraries/MY_Profiler.php b/fuel/modules/fuel/libraries/MY_Profiler.php
index 36e325b81..cf81b1ccb 100644
--- a/fuel/modules/fuel/libraries/MY_Profiler.php
+++ b/fuel/modules/fuel/libraries/MY_Profiler.php
@@ -110,7 +110,7 @@ protected function _compile_queries()
 				{
 					$time = number_format($db->query_times[$key], 4);
 
-					$val = highlight_code($val, ENT_QUOTES);
+					$val = highlight_code($val);
 
 					foreach ($highlight as $bold)
 					{

From 2ddd3364604e856c65bc4717fe7fe0aa021e9c3f Mon Sep 17 00:00:00 2001
From: Martynas Sateika <martynas.sateika@gmail.com>
Date: Sun, 9 Sep 2018 00:44:28 +0100
Subject: [PATCH 098/129] Remove unnecessary permission 'create' call

---
 fuel/modules/fuel/controllers/Generate.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/fuel/modules/fuel/controllers/Generate.php b/fuel/modules/fuel/controllers/Generate.php
index 4eb64e1a4..3b6c64f07 100644
--- a/fuel/modules/fuel/controllers/Generate.php
+++ b/fuel/modules/fuel/controllers/Generate.php
@@ -49,9 +49,6 @@ public function advanced($name = NULL)
 
 		foreach($names as $name) $this->_advanced($name);
 
-		// create a generic permission for the advanced module
-		$this->fuel->permissions->create($name);
-
 		$vars['created'] = $this->created;
 		$vars['errors'] = $this->errors;
 		$vars['modified'] = $this->modified;

From 00ca28953c61243b3d89a239818873fe2bb077bb Mon Sep 17 00:00:00 2001
From: Martynas Sateika <martynas.sateika@gmail.com>
Date: Sun, 9 Sep 2018 18:39:03 +0100
Subject: [PATCH 099/129] Fix incorrect module names in docs in
 fuel_modules.php

---
 fuel/modules/fuel/config/fuel_modules.php | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/fuel/modules/fuel/config/fuel_modules.php b/fuel/modules/fuel/config/fuel_modules.php
index 485446973..c81a1a8eb 100644
--- a/fuel/modules/fuel/config/fuel_modules.php
+++ b/fuel/modules/fuel/config/fuel_modules.php
@@ -9,7 +9,7 @@
 
 $config['modules'] = array();
 
-// Page module init values
+// Pages module init values
 $config['modules']['pages'] = array(
 	'module_name' => 'Pages',
 	'model_location' => 'fuel',
@@ -62,7 +62,7 @@
 	),
 );
 
-// Page module init values
+// Pagevariables module init values
 $config['modules']['pagevariables'] = array(
 	'module_name' => 'Page Variables',
 	'model_location' => 'fuel',
@@ -87,7 +87,7 @@
 	'hidden' => TRUE
 );
 
-// Navigation module init values
+// Blocks module init values
 $config['modules']['blocks'] = array(
 	'module_name' => 'Blocks',
 	'model_location' => 'fuel',
@@ -153,7 +153,7 @@
 	'permission' => 'navigation'
 );
 
-// Navigation module init values
+// Categories module init values
 $config['modules']['categories'] = array(
 	'module_name' => 'Categories',
 	'model_location' => 'fuel',
@@ -181,7 +181,7 @@
 	)
 );
 
-// Navigation module init values
+// Tags module init values
 $config['modules']['tags'] = array(
 	'module_name' => 'Tags',
 	'model_location' => 'fuel',
@@ -230,7 +230,7 @@
 	'sanitize_images' => FALSE
 );
 
-// Sitevariable module init values
+// Sitevariables module init values
 $config['modules']['sitevariables'] = array(
 	'module_name' => 'Site Variables',
 	'model_location' => 'fuel',
@@ -328,7 +328,7 @@
 	'clear_cache_on_save' => FALSE
 );
 
-// Permissions module init values
+// Logs module init values
 $config['modules']['logs'] = array(
 	'module_name' => 'Activity Log',
 	'model_location' => 'fuel',
@@ -363,7 +363,5 @@
 	)
 );
 
-//@include(APPPATH.'config/MY_fuel_modules.php');
-
 /* End of file fuel_modules.php */
 /* Location: ./modules/fuel/config/fuel_modules.php */
\ No newline at end of file

From fd6eb516000e2ba17c854a648ad3137748a089fd Mon Sep 17 00:00:00 2001
From: Martynas Sateika <martynas.sateika@gmail.com>
Date: Thu, 13 Sep 2018 01:38:55 +0100
Subject: [PATCH 100/129] Fix wrong case in 'require_once' statement in module
 documentation.

The require_once references a file with a lower-case name. This is not
allowed by CodeIgniter since version 3.0.
---
 fuel/modules/fuel/views/_docs/modules/simple.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fuel/modules/fuel/views/_docs/modules/simple.php b/fuel/modules/fuel/views/_docs/modules/simple.php
index 4a773e3b5..7d6665c56 100644
--- a/fuel/modules/fuel/views/_docs/modules/simple.php
+++ b/fuel/modules/fuel/views/_docs/modules/simple.php
@@ -528,7 +528,7 @@ public function filters()
 <pre class="brush:php">
 &lt;?php  if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-require_once(FUEL_PATH.'models/base_posts_model.php');
+require_once(FUEL_PATH.'models/Base_posts_model.php');
 
 class Articles_model extends Base_posts_model {
 

From 37a004735a4ce64832b46e6db3de49c18d3b6314 Mon Sep 17 00:00:00 2001
From: David McReynolds <dave@thedaylightstudio.com>
Date: Wed, 26 Sep 2018 10:47:05 -0700
Subject: [PATCH 101/129] Fix potential error when migrating without a module
 reference

---
 fuel/modules/fuel/controllers/Migrate.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/fuel/modules/fuel/controllers/Migrate.php b/fuel/modules/fuel/controllers/Migrate.php
index c4881a40b..73bf65c24 100644
--- a/fuel/modules/fuel/controllers/Migrate.php
+++ b/fuel/modules/fuel/controllers/Migrate.php
@@ -24,7 +24,7 @@ public function __construct()
 		}
 	}
 
-	public function latest($module = NULL)
+	public function latest($module = '')
 	{
 		$this->_init_migrate($module);
 
@@ -35,7 +35,7 @@ public function latest($module = NULL)
 		$this->_success($version);
 	}
 
-	public function current($module = NULL)
+	public function current($module = '')
 	{
 		$this->_init_migrate($module);
 
@@ -46,7 +46,7 @@ public function current($module = NULL)
 		$this->_success($version);
 	}
 
-	public function version($version = 1, $module = NULL)
+	public function version($version = 1, $module = '')
 	{
 		$this->_init_migrate($module);
 

From ca30c082cd5b2c30837ca42330a672eb97990298 Mon Sep 17 00:00:00 2001
From: Martynas Sateika <martynas.sateika@gmail.com>
Date: Mon, 1 Oct 2018 21:38:24 +0100
Subject: [PATCH 102/129] Fix unused variable in Fuel_advanced_module.

The same 'substr' operation is done twice in a row, yet the first call's
result is discarded. This commit makes sure it is used and 'substr' is
not needlessly called the second time.
---
 fuel/modules/fuel/libraries/Fuel_advanced_module.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fuel/modules/fuel/libraries/Fuel_advanced_module.php b/fuel/modules/fuel/libraries/Fuel_advanced_module.php
index 1aea4909a..d05cf545d 100644
--- a/fuel/modules/fuel/libraries/Fuel_advanced_module.php
+++ b/fuel/modules/fuel/libraries/Fuel_advanced_module.php
@@ -277,8 +277,8 @@ public function models($remove_suffix = FALSE)
 				// removes '_model'... must have this suffix to work!!!
 				if ($remove_suffix)
 				{
-					$mod_name = substr($models[$key], 0, -6);
-					$models[$key] = substr($models[$key], 0, -6);
+					$model_name = substr($models[$key], 0, -6);
+					$models[$key] = $model_name;
 				}
 			}
 			

From b98df0904b845cdfd98de98b7ea494aa7c67121d Mon Sep 17 00:00:00 2001
From: Martynas Sateika <martynas.sateika@gmail.com>
Date: Mon, 1 Oct 2018 21:45:58 +0100
Subject: [PATCH 103/129] Fix issues with HTML IDs in several documentation
 files

---
 fuel/application/views/_docs/index.php               | 2 +-
 fuel/modules/fuel/views/_docs/general/forms.php      | 2 +-
 fuel/modules/fuel/views/_docs/general/models.php     | 2 +-
 fuel/modules/fuel/views/_docs/general/navigation.php | 2 +-
 fuel/modules/fuel/views/_docs/modules/tutorial.php   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/fuel/application/views/_docs/index.php b/fuel/application/views/_docs/index.php
index 0ae248632..e7f12b9fc 100644
--- a/fuel/application/views/_docs/index.php
+++ b/fuel/application/views/_docs/index.php
@@ -39,7 +39,7 @@
 			<li><strong><a href="#blocks">Blocks</a></strong> - create reusable block elements (e.g. headers, footers, callouts, etc).</li>
 			<li><strong><a href="#categories">Categories</a></strong> - create categories to group records together.</li>
 			<li><strong><a href="#tags">Tags</a></strong> - create tags to associate with one or more other module records to allow for easy filtering.</li>
-			<li><strong><a href="sitevariables">Site Variables</a></strong> - create variables that can be used throughout your website (e.g. a contact email address).</li>
+			<li><strong><a href="#sitevariables">Site Variables</a></strong> - create variables that can be used throughout your website (e.g. a contact email address).</li>
 			<li><strong><a href="#users">Users</a></strong> - create users and associate permissions with them.</li>
 			<li><strong><a href="#permissions">Permissions</a></strong> - create permissions to associate with other users.</li>
 		</ul>
diff --git a/fuel/modules/fuel/views/_docs/general/forms.php b/fuel/modules/fuel/views/_docs/general/forms.php
index afe9606e7..3378734d7 100644
--- a/fuel/modules/fuel/views/_docs/general/forms.php
+++ b/fuel/modules/fuel/views/_docs/general/forms.php
@@ -206,7 +206,7 @@ function form_builder_example($field, $params = NULL, $include_submit = FALSE)
 		<li><a href="#state">state</a></li>
 		<li><a href="#slug">slug</a></li>
 		<li><a href="#list_items">list_items</a></li>
-		<li><a href="#langauge">langauge</a></li>
+		<li><a href="#language">language</a></li>
 		<li><a href="#keyval">keyval</a></li>
 		<li><a href="#multi">multi</a> (overwritten for more functionality)</li>
 		<li><a href="#toggler">toggler</a></li>
diff --git a/fuel/modules/fuel/views/_docs/general/models.php b/fuel/modules/fuel/views/_docs/general/models.php
index 9c7fdf61a..161911714 100644
--- a/fuel/modules/fuel/views/_docs/general/models.php
+++ b/fuel/modules/fuel/views/_docs/general/models.php
@@ -301,7 +301,7 @@ function __construct()
 $record->content
 </pre>
 
-<p>There are also additional <a href="#formattters">formatter</a> variations you can use on a record property &mdash; such as <dfn>{property}_formatted</dfn> and <dfn>{property}_stripped</dfn>.</p>
+<p>There are also additional <a href="#formatters">formatter</a> variations you can use on a record property &mdash; such as <dfn>{property}_formatted</dfn> and <dfn>{property}_stripped</dfn>.</p>
 <p>Using <dfn>{property}_formatted</dfn> will apply the <a href="https://www.codeigniter.com/user_guide/helpers/typography_helper.html" target="_blank">auto_typography</a>
 function if the property is a string value and if it is a date value will format the date by default to whatever is specified in the <span class="file">fuel/application/config/MY_config.php</span>.
 </p>
diff --git a/fuel/modules/fuel/views/_docs/general/navigation.php b/fuel/modules/fuel/views/_docs/general/navigation.php
index 2ce9ea9b5..5ce80dcb5 100644
--- a/fuel/modules/fuel/views/_docs/general/navigation.php
+++ b/fuel/modules/fuel/views/_docs/general/navigation.php
@@ -107,7 +107,7 @@
 
 <h3 id="hdr_footermenu">Footer Menu</h3>
 <p>Another place you may want to add a list of menu items is at the footer of your layout. This can be done similar to both the <a href="#hdr_topmenu">Top Menu</a> and 
-the <a href="#sidemenu">Side Menu</a>:</p>
+the <a href="#hdr_sidemenu">Side Menu</a>:</p>
 
 <span class="file">application/views/_variables/global.php (example)</span>
 <pre class="brush: php">
diff --git a/fuel/modules/fuel/views/_docs/modules/tutorial.php b/fuel/modules/fuel/views/_docs/modules/tutorial.php
index f373e6e27..69348a0cf 100644
--- a/fuel/modules/fuel/views/_docs/modules/tutorial.php
+++ b/fuel/modules/fuel/views/_docs/modules/tutorial.php
@@ -14,7 +14,7 @@
   <li><a href="#setup">Download and Setup</a></li>
   <li><a href="#authors_module">The Authors Module</a></li>
   <li><a href="#articles_module">The Articles Module</a></li>
-  <li><a href="#categories_module">The FUEL Tags Module</a></li>
+  <li><a href="#fuel_tags_module">The FUEL Tags Module</a></li>
   <li><a href="#permissions">Setting Up Permissions</a></li>
   <li><a href="#polishing">A Little Polishing</a></li>
   <li><a href="#views">Bringing it All Into View</a></li>

From cd3b8ac1d3aebc57d4e5d037401bf91b8fd9cb80 Mon Sep 17 00:00:00 2001
From: David McReynolds <dave@thedaylightstudio.com>
Date: Mon, 1 Oct 2018 15:40:55 -0700
Subject: [PATCH 104/129] Documentation updates per issue #503

---
 fuel/application/views/_docs/index.php           | 6 ++----
 fuel/modules/fuel/views/_docs/general/models.php | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/fuel/application/views/_docs/index.php b/fuel/application/views/_docs/index.php
index 0ae248632..53513b735 100644
--- a/fuel/application/views/_docs/index.php
+++ b/fuel/application/views/_docs/index.php
@@ -40,15 +40,13 @@
 			<li><strong><a href="#categories">Categories</a></strong> - create categories to group records together.</li>
 			<li><strong><a href="#tags">Tags</a></strong> - create tags to associate with one or more other module records to allow for easy filtering.</li>
 			<li><strong><a href="sitevariables">Site Variables</a></strong> - create variables that can be used throughout your website (e.g. a contact email address).</li>
-			<li><strong><a href="#users">Users</a></strong> - create users and associate permissions with them.</li>
-			<li><strong><a href="#permissions">Permissions</a></strong> - create permissions to associate with other users.</li>
+			<li><strong><a href="#users">Users &amp; Permissions</a></strong> - create users and associate permissions with them.</li>
 		</ul>
 	</li>
 	
 	<li><strong>Manage</strong> - The following modules are used to manage various aspects of the site:
 		<ul>
-			<li><strong><a href="#users">Users</a></strong> - allows you to create and manage permissions of FUEL CMS users.</li>
-			<li><strong><a href="#permissions">Permissions</a></strong> - used to manage permissions and associate to users.</li>
+			<li><strong><a href="#users">Users &amp; Permissions</a></strong> - allows you to create and manage permissions of FUEL CMS users.</li>
 			<li><strong><a href="#cache">Page Cache</a></strong> - used to clear the cache of the site.</li>
 			<li><strong>Activity Log</strong> - allows you to view the activity logs within FUEL CMS.</li>
 			<li><strong><a href="#settings">Settings</a></strong> - used to manage module specific configurations.</li>
diff --git a/fuel/modules/fuel/views/_docs/general/models.php b/fuel/modules/fuel/views/_docs/general/models.php
index 9c7fdf61a..a70686535 100644
--- a/fuel/modules/fuel/views/_docs/general/models.php
+++ b/fuel/modules/fuel/views/_docs/general/models.php
@@ -15,7 +15,7 @@
 <p>Both classes allow you to create <a href="<?=user_guide_url('general/forms')?>">simple to complex form interfaces</a> with the model's <dfn>MY_Model::form_fields()</dfn>
 method, which gets passed to the <a href="<?=user_guide_url('libraries/form_builder')?>">Form_builder</a> object to generate the forms in the CMS.</p>
 
-<p>There's a lot to cover for model's. Below is an overview of the main features but it is recommended that you look at the <a href="#table_result_record">API documentation for both table and record model classes</a> (explained below).</p>
+<p>There's a lot to cover for model's. Below is an overview of the main features but it is recommended that you look at the <a href="#table_result_record_field">API documentation for both table and record model classes</a> (explained below).</p>
 <ul>
 	<li><a href="#example">Example</a></li>
 	<li><a href="#table_result_record_field">Table, Result, Record and Field Classes</a></li>

From 10049b385a9b503da020ed69075ec9261d553c84 Mon Sep 17 00:00:00 2001
From: Martynas Sateika <martynas.sateika@gmail.com>
Date: Mon, 1 Oct 2018 23:53:07 +0100
Subject: [PATCH 105/129] Initialize function parameters array in 'Inspection'
 class.

PHP 7.2.0 displays warnings when NULL is passed to its 'count' function,
which is exactly what happens if the User Guide module tries rendering
a method with no arguments.

This commit fixes that by initializing the 'params' variable with an
empty array in the 'initialize' method.
---
 fuel/modules/fuel/libraries/Inspection.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fuel/modules/fuel/libraries/Inspection.php b/fuel/modules/fuel/libraries/Inspection.php
index c9d08226e..85b8333ac 100644
--- a/fuel/modules/fuel/libraries/Inspection.php
+++ b/fuel/modules/fuel/libraries/Inspection.php
@@ -1330,6 +1330,7 @@ public function initialize($ref_class, $method, $obj = NULL)
 		if (method_exists($this->reflection, 'getParameters'))
 		{
 			$params = $this->reflection->getParameters();
+			$this->params = array();
 			foreach($params as $param)
 			{
 				$p = new Inspection_param($param);

From 4710564598c7bb63d953954aced4055d5e5a432b Mon Sep 17 00:00:00 2001
From: Martynas Sateika <martynas.sateika@gmail.com>
Date: Tue, 2 Oct 2018 01:20:31 +0100
Subject: [PATCH 106/129] Return CSS path when 'css_path' function is called.

This adds a missing 'return' statement in Fuel_advanced_module. Given
the way the 'web_path' method works, an extra slash had to be added
before 'assets'.
---
 fuel/modules/fuel/libraries/Fuel_advanced_module.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fuel/modules/fuel/libraries/Fuel_advanced_module.php b/fuel/modules/fuel/libraries/Fuel_advanced_module.php
index d05cf545d..6c9b72782 100644
--- a/fuel/modules/fuel/libraries/Fuel_advanced_module.php
+++ b/fuel/modules/fuel/libraries/Fuel_advanced_module.php
@@ -774,7 +774,7 @@ public function has_routes()
 	 */
 	public function css_path()
 	{
-		$this->web_path().'assets/'.strtolower($this->name).'.css';
+		return $this->web_path().'/assets/'.strtolower($this->name).'.css';
 	}
 
 	// --------------------------------------------------------------------

From 7797ae1c72b8382f096564f6e17f555d72967d1f Mon Sep 17 00:00:00 2001
From: Martynas Sateika <martynas.sateika@gmail.com>
Date: Tue, 2 Oct 2018 02:10:37 +0100
Subject: [PATCH 107/129] Fix variable assigned to itself in
 module_close_modal.php

---
 fuel/modules/fuel/views/modules/module_close_modal.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fuel/modules/fuel/views/modules/module_close_modal.php b/fuel/modules/fuel/views/modules/module_close_modal.php
index 7cea27087..ef6eca44e 100644
--- a/fuel/modules/fuel/views/modules/module_close_modal.php
+++ b/fuel/modules/fuel/views/modules/module_close_modal.php
@@ -7,6 +7,6 @@
 
 	// for inline editing on the front end we just refresh the page
 	} else if (top.window != window){
-		top.window.location = top.window.location;
+		top.window.location = window.location;
 	}
 </script>
\ No newline at end of file

From a947ba65143ff1495612ad6a038642b99ddd835b Mon Sep 17 00:00:00 2001
From: David McReynolds <dave@thedaylightstudio.com>
Date: Tue, 2 Oct 2018 12:44:50 -0700
Subject: [PATCH 108/129] Fuel_navigation_model fixes in _common_query

---
 fuel/modules/fuel/models/Fuel_navigation_model.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fuel/modules/fuel/models/Fuel_navigation_model.php b/fuel/modules/fuel/models/Fuel_navigation_model.php
index f690f8779..491bc6ecf 100644
--- a/fuel/modules/fuel/models/Fuel_navigation_model.php
+++ b/fuel/modules/fuel/models/Fuel_navigation_model.php
@@ -531,9 +531,9 @@ public function on_before_validate($values)
 	public function _common_query($params = NULL)
 	{
 		parent::_common_query();
-		$this->db->select($this->_tables['fuel_navigation'].'.*, '.$this->_tables['fuel_navigation_groups'].'.id group_id, '.$this->_tables['fuel_navigation_groups'].'.name group_name');
+		$this->db->select($this->_tables['fuel_navigation'].'.*, '.$this->_tables['fuel_navigation_groups'].'.id AS group_id, '.$this->_tables['fuel_navigation_groups'].'.name group_name');
 		$this->db->join($this->_tables['fuel_navigation_groups'], $this->_tables['fuel_navigation_groups'].'.id='.$this->_tables['fuel_navigation'].'.group_id', 'left');
-		$this->db->order_by('precedence, location asc');
+		$this->db->order_by('precedence asc, location asc');
 	}
 	
 	// --------------------------------------------------------------------

From ced88cb32fcd46cf5c07c498e00919ecea31bfdc Mon Sep 17 00:00:00 2001
From: Martynas Sateika <martynas.sateika@gmail.com>
Date: Tue, 2 Oct 2018 23:01:00 +0100
Subject: [PATCH 109/129] Add missing trailing underscore in PHP '__CLASS__'
 constant

---
 fuel/modules/fuel/core/MY_Model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fuel/modules/fuel/core/MY_Model.php b/fuel/modules/fuel/core/MY_Model.php
index 71b55a938..8e1c20986 100755
--- a/fuel/modules/fuel/core/MY_Model.php
+++ b/fuel/modules/fuel/core/MY_Model.php
@@ -5186,7 +5186,7 @@ public function prop_exists($key)
 	 */	
 	public function is_empty()
 	{
-		return empty($this->_fields) AND get_class_vars(__CLASS_);
+		return empty($this->_fields) AND get_class_vars(__CLASS__);
 	}
 
 	// --------------------------------------------------------------------

From 528931a16991104cc03fb3fe2d93b9ba9b60b153 Mon Sep 17 00:00:00 2001
From: Martynas Sateika <martynas.sateika@gmail.com>
Date: Tue, 2 Oct 2018 23:09:39 +0100
Subject: [PATCH 110/129] Add missing 'break' statement in
 \Inspection_comment::description

---
 fuel/modules/fuel/libraries/Inspection.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fuel/modules/fuel/libraries/Inspection.php b/fuel/modules/fuel/libraries/Inspection.php
index 85b8333ac..2c64a7576 100644
--- a/fuel/modules/fuel/libraries/Inspection.php
+++ b/fuel/modules/fuel/libraries/Inspection.php
@@ -1127,6 +1127,7 @@ public function description($format = FALSE)
 						$lines = preg_replace('#(.+[^\.|>]\s*)$#', '$1. ', trim($lines));
 						
 						$desc = $lines;
+						break;
 					case 'ucfirst':
 						$desc = ucfirst($desc);
 						break;

From 5f22279d473bd8addc4997b4fe99a3cdf509f75f Mon Sep 17 00:00:00 2001
From: Martynas Sateika <martynas.sateika@gmail.com>
Date: Tue, 2 Oct 2018 23:47:50 +0100
Subject: [PATCH 111/129] Fix incorrect return values in Fuel_redirects methods

---
 .../modules/fuel/libraries/Fuel_redirects.php | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/fuel/modules/fuel/libraries/Fuel_redirects.php b/fuel/modules/fuel/libraries/Fuel_redirects.php
index 5acb85f23..1b6fa49bd 100644
--- a/fuel/modules/fuel/libraries/Fuel_redirects.php
+++ b/fuel/modules/fuel/libraries/Fuel_redirects.php
@@ -80,7 +80,7 @@ public function initialize($params = array())
 	 * @param	string	The URI location of the page to remove
 	 * @param	string	The page to redirect to or the type of redirect if the first parameter is an array (optional)
 	 * @param	boolean	Determines whether it is a passive redirect or not. Default is TRUE(optional)
-	 * @return	array	
+	 * @return	void
 	 */	
 	public function add($uri, $redirect = '', $passive = TRUE)
 	{
@@ -117,7 +117,7 @@ public function add($uri, $redirect = '', $passive = TRUE)
 	 * @access	public
 	 * @param	string	The URI location of the page to remove
 	 * @param	boolean	Determines whether it is a passive redirect or not. Default is TRUE(optional)
-	 * @return	array	
+	 * @return	void
 	 */	
 	public function remove($uri, $passive = TRUE)
 	{
@@ -140,7 +140,7 @@ public function remove($uri, $passive = TRUE)
 	 * @param	string	The URI location of the page to remove
 	 * @param	string	The page to redirect to or the name of the environment if the first parameter is an array(optional)
 	 * @param	string	The name of the environment key that the redirect applies to (optional)
-	 * @return	array	
+	 * @return	void
 	 */	
 	public function add_ssl($uri, $environment = '')
 	{
@@ -155,7 +155,7 @@ public function add_ssl($uri, $environment = '')
 	 * @access	public
 	 * @param	string	The URI location of the page to remove
 	 * @param	string	The name of the environment key that the redirect applies to (optional)
-	 * @return	array	
+	 * @return	void
 	 */	
 	public function remove_ssl($uri, $environment = 'production')
 	{
@@ -171,12 +171,11 @@ public function remove_ssl($uri, $environment = 'production')
 	 * @param	string	The URI location of the page to remove
 	 * @param	string	The page to redirect to or the name of the environment if the first parameter is an array(optional)
 	 * @param	string	The name of the environment key that the redirect applies to (optional)
-	 * @return	array	
+	 * @return	void
 	 */	
 	public function add_non_ssl($uri, $environment = '')
 	{
 		$this->_add_ssl_type($uri, $environment, 'non_ssl');
-
 	}
 	
 	// --------------------------------------------------------------------
@@ -187,7 +186,7 @@ public function add_non_ssl($uri, $environment = '')
 	 * @access	public
 	 * @param	string	The URI location of the page to remove
 	 * @param	string	The name of the environment key that the redirect applies to (optional)
-	 * @return	array	
+	 * @return	void
 	 */	
 	public function remove_non_ssl($uri, $environment = 'production')
 	{
@@ -204,7 +203,7 @@ public function remove_non_ssl($uri, $environment = 'production')
 	 * @param	string	The page to redirect to or the name of the environment if the first parameter is an array(optional)
 	 * @param	string	The name of the environment key that the redirect applies to (optional)
 	 * @param	string	The type of SSL either redirect... either to https or http (optional)
-	 * @return	array	
+	 * @return	void
 	 */	
 	protected function _add_ssl_type($uri, $redirect = '', $environment = '', $type = 'ssl')
 	{
@@ -235,7 +234,7 @@ protected function _add_ssl_type($uri, $redirect = '', $environment = '', $type
 	 * @param	string	The URI location of the page to remove
 	 * @param	string	The name of the environment key that the redirect applies to (optional)
 	 * @param	string	The type of SSL either redirect... either to https or http (optional)
-	 * @return	array	
+	 * @return	void
 	 */	
 	protected function _remove_ssl_type($uri, $environment = '', $type = 'ssl')
 	{
@@ -300,7 +299,7 @@ public function config()
 	 *
 	 * @access	public
 	 * @param	boolean	Determines whether only redirect those pages that are deemed "passive"
-	 * @return	array	
+	 * @return	array
 	 */	
 	public function redirects($only_passive = TRUE)
 	{
@@ -317,7 +316,6 @@ public function redirects($only_passive = TRUE)
 			$this->add($config['aggressive_redirects'], FALSE);
 			return $this->aggressive_redirects;
 		}
-
 	}
 
 	// --------------------------------------------------------------------

From 2bae4547cba3fb91f2c0b7c656a0be67ecf6dccb Mon Sep 17 00:00:00 2001
From: Martynas Sateika <martynas.sateika@gmail.com>
Date: Tue, 2 Oct 2018 23:54:51 +0100
Subject: [PATCH 112/129] Return empty array instead of NULL in
 \Fuel_redirects::redirects

---
 fuel/modules/fuel/libraries/Fuel_redirects.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/fuel/modules/fuel/libraries/Fuel_redirects.php b/fuel/modules/fuel/libraries/Fuel_redirects.php
index 1b6fa49bd..7a43daebf 100644
--- a/fuel/modules/fuel/libraries/Fuel_redirects.php
+++ b/fuel/modules/fuel/libraries/Fuel_redirects.php
@@ -316,6 +316,8 @@ public function redirects($only_passive = TRUE)
 			$this->add($config['aggressive_redirects'], FALSE);
 			return $this->aggressive_redirects;
 		}
+
+		return array();
 	}
 
 	// --------------------------------------------------------------------

From 3b30506bc73756c1e106451a0bb70d450f1f0502 Mon Sep 17 00:00:00 2001
From: Martynas Sateika <martynas.sateika@gmail.com>
Date: Wed, 3 Oct 2018 00:44:37 +0100
Subject: [PATCH 113/129] Fix broken link to CodeIgniter forum thread

---
 fuel/modules/fuel/views/_docs/modules/generate.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fuel/modules/fuel/views/_docs/modules/generate.php b/fuel/modules/fuel/views/_docs/modules/generate.php
index cc5169aac..84bc6a17b 100644
--- a/fuel/modules/fuel/views/_docs/modules/generate.php
+++ b/fuel/modules/fuel/views/_docs/modules/generate.php
@@ -53,7 +53,7 @@
 php index.php fuel/generate/model my_model examples
 </pre>
 
-<p class="important">If you are on a MAC and having trouble where the script is outputting nothing, you may need to make sure you are calling the right php binary. In my case, I needed to call to a /Applications/MAMP/bin/php5/bin/php. Here is a thread that talks about it more: http://codeigniter.com/forums/viewthread/130383/ Hopefully it saves you some time too!</p>
+<p class="important">If you are on a MAC and having trouble where the script is outputting nothing, you may need to make sure you are calling the right php binary. In my case, I needed to call to a /Applications/MAMP/bin/php5/bin/php. Here is a thread that talks about it more: <a href="https://forum.codeigniter.com/thread-23025.html" target="_blank">https://forum.codeigniter.com/thread-23025.html</a> Hopefully it saves you some time too!</p>
 <p class="important">Separating module names with a colon will generate multiple models.</p>
 
 <h2 id="simple">Simple Modules</h2>

From 72f868257e70c30f11a3aa62fa11d1359ce9da0c Mon Sep 17 00:00:00 2001
From: David McReynolds <dave@thedaylightstudio.com>
Date: Fri, 5 Oct 2018 13:37:32 -0700
Subject: [PATCH 114/129] Fix for issue #509

---
 fuel/modules/fuel/libraries/Fuel_posts.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/fuel/modules/fuel/libraries/Fuel_posts.php b/fuel/modules/fuel/libraries/Fuel_posts.php
index 3dc02bd90..c7e6392b2 100644
--- a/fuel/modules/fuel/libraries/Fuel_posts.php
+++ b/fuel/modules/fuel/libraries/Fuel_posts.php
@@ -582,18 +582,19 @@ public function get_category_posts($category, $order_by = NULL, $limit = NULL, $
 	 *
 	 * @access	public
 	 * @param	string 	The tag slug or ID value to search -- can also be a Fuel_tag_model object (optional)
+	 * @param	string 	The order of the results
 	 * @param	int The limit of results
 	 * @param	int The offset of the results
 	 * @return	array
 	 */
-	public function get_tag_posts($tag, $limit = NULL, $offset = NULL)
+	public function get_tag_posts($tag, $order_by = NULL, $limit = NULL, $offset = NULL)
 	{
 		$model = $this->model();
 
 		// use the method on the model if it exists
 		if (method_exists($model, 'get_tag_posts'))
 		{
-			return $model->get_tag_posts($tag, $limit, $offset);
+			return $model->get_tag_posts($tag, $order_by, $limit, $offset);
 		}
 
 		$tables = $model->tables();
@@ -611,7 +612,7 @@ public function get_tag_posts($tag, $limit = NULL, $offset = NULL)
 			$where[$tables['fuel_tags'].'.slug'] = $tag;	
 		}
 		
-		$posts = $model->find_all($where, NULL, $limit, $offset);
+		$posts = $model->find_all($where, $order_by, $limit, $offset);
 		return $posts;
 	}
 	// --------------------------------------------------------------------

From 8e5e4958d75d9e4027c2689f4f5b98158e111100 Mon Sep 17 00:00:00 2001
From: David McReynolds <dave@thedaylightstudio.com>
Date: Fri, 5 Oct 2018 13:38:37 -0700
Subject: [PATCH 115/129] Fix for issue #508

---
 fuel/modules/fuel/controllers/Module.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fuel/modules/fuel/controllers/Module.php b/fuel/modules/fuel/controllers/Module.php
index eeeca9660..2ba250a2f 100644
--- a/fuel/modules/fuel/controllers/Module.php
+++ b/fuel/modules/fuel/controllers/Module.php
@@ -547,7 +547,7 @@ function items()
 	 */	
 	function inline_items()
 	{
-		$this->items(TRUE);
+		$this->items();
 	}
 
 	// --------------------------------------------------------------------

From 74eeecdd72f962f3feb24a4ddd84e5a99bab8dce Mon Sep 17 00:00:00 2001
From: Martynas Sateika <martynas.sateika@gmail.com>
Date: Sat, 6 Oct 2018 13:56:48 +0100
Subject: [PATCH 116/129] Fix various small PhpDoc issues related to return
 values

---
 fuel/modules/fuel/core/MY_DB_mysql_driver.php        | 2 +-
 fuel/modules/fuel/core/MY_DB_mysql_result.php        | 4 ++--
 fuel/modules/fuel/core/MY_DB_mysqli_driver.php       | 2 +-
 fuel/modules/fuel/core/MY_DB_mysqli_result.php       | 4 ++--
 fuel/modules/fuel/core/Router.php                    | 3 ++-
 fuel/modules/fuel/helpers/MY_array_helper.php        | 4 ++--
 fuel/modules/fuel/libraries/Cache.php                | 4 ++--
 fuel/modules/fuel/libraries/Curl.php                 | 2 +-
 fuel/modules/fuel/libraries/Data_table.php           | 2 +-
 fuel/modules/fuel/libraries/Form_builder.php         | 8 ++++----
 fuel/modules/fuel/libraries/Fuel.php                 | 2 +-
 fuel/modules/fuel/libraries/Fuel_advanced_module.php | 2 +-
 fuel/modules/fuel/libraries/Fuel_base_library.php    | 2 +-
 fuel/modules/fuel/libraries/Fuel_parser.php          | 1 -
 fuel/modules/fuel/libraries/MY_Image_lib.php         | 6 +++---
 fuel/modules/fuel/models/Base_module_model.php       | 2 +-
 fuel/modules/fuel/models/Fuel_pages_model.php        | 2 +-
 17 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/fuel/modules/fuel/core/MY_DB_mysql_driver.php b/fuel/modules/fuel/core/MY_DB_mysql_driver.php
index 2861a58ac..e8d72a86b 100644
--- a/fuel/modules/fuel/core/MY_DB_mysql_driver.php
+++ b/fuel/modules/fuel/core/MY_DB_mysql_driver.php
@@ -147,7 +147,7 @@ public function field_info($table, $field)
 	 * @access	public
 	 * @param	string	name of table
 	 * @param	string	field name
-	 * @return	string
+	 * @return	array
 	 */
 	public function table_info($table, $set_field_key = TRUE)
 	{
diff --git a/fuel/modules/fuel/core/MY_DB_mysql_result.php b/fuel/modules/fuel/core/MY_DB_mysql_result.php
index c665d86ad..ed46055b7 100644
--- a/fuel/modules/fuel/core/MY_DB_mysql_result.php
+++ b/fuel/modules/fuel/core/MY_DB_mysql_result.php
@@ -39,7 +39,7 @@ class MY_DB_mysql_result extends CI_DB_mysql_result {
 	 *
 	 * @access	public
 	 * @param	string	field name to use as associative key
-	 * @return	void
+	 * @return	array
 	 */
 	public function result_assoc_array($key)
 	{
@@ -83,7 +83,7 @@ public function result_assoc_array($key)
 	 *
 	 * @access	public
 	 * @param	string	field name to use as associative key
-	 * @return	void
+	 * @return	array
 	 */
 	public function result_assoc($key)
 	{
diff --git a/fuel/modules/fuel/core/MY_DB_mysqli_driver.php b/fuel/modules/fuel/core/MY_DB_mysqli_driver.php
index de057ebe9..51ef37733 100644
--- a/fuel/modules/fuel/core/MY_DB_mysqli_driver.php
+++ b/fuel/modules/fuel/core/MY_DB_mysqli_driver.php
@@ -329,7 +329,7 @@ public function get_query_string($clear = TRUE)
 	 * Clears the compiled query string
 	 *
 	 * @access	public
-	 * @return	string
+	 * @return	void
 	 */
 	public function clear_query_string()
 	{
diff --git a/fuel/modules/fuel/core/MY_DB_mysqli_result.php b/fuel/modules/fuel/core/MY_DB_mysqli_result.php
index 506d9913a..06d2db48d 100644
--- a/fuel/modules/fuel/core/MY_DB_mysqli_result.php
+++ b/fuel/modules/fuel/core/MY_DB_mysqli_result.php
@@ -39,7 +39,7 @@ class MY_DB_mysqli_result extends CI_DB_mysqli_result {
 	 *
 	 * @access	public
 	 * @param	string	field name to use as associative key
-	 * @return	void
+	 * @return	array
 	 */
 	public function result_assoc_array($key)
 	{
@@ -83,7 +83,7 @@ public function result_assoc_array($key)
 	 *
 	 * @access	public
 	 * @param	string	field name to use as associative key
-	 * @return	void
+	 * @return	array
 	 */
 	public function result_assoc($key)
 	{
diff --git a/fuel/modules/fuel/core/Router.php b/fuel/modules/fuel/core/Router.php
index ac6739424..7f72b76ac 100644
--- a/fuel/modules/fuel/core/Router.php
+++ b/fuel/modules/fuel/core/Router.php
@@ -83,7 +83,8 @@ protected function _parse_routes()
 		// Is there a literal match?  If so we're done
 		if (isset($this->routes[$uri]))
 		{
-			return $this->_set_request(explode('/', $this->routes[$uri]));
+			$this->_set_request(explode('/', $this->routes[$uri]));
+			return;
 		}
 		
 		// Get HTTP verb
diff --git a/fuel/modules/fuel/helpers/MY_array_helper.php b/fuel/modules/fuel/helpers/MY_array_helper.php
index 89acd9b53..6b0dc224b 100644
--- a/fuel/modules/fuel/helpers/MY_array_helper.php
+++ b/fuel/modules/fuel/helpers/MY_array_helper.php
@@ -112,7 +112,7 @@ function array_sorter(&$array, $index, $order = 'asc', $nat_sort = FALSE, $case_
 	 * @param	mixed
 	 * @param	string
 	 * @param	string
-	 * @return	NULL
+	 * @return	void
 	 */
 	function object_sorter(&$data, $key, $order = 'asc')
 	{
@@ -250,7 +250,7 @@ function array_group($array, $groups)
 	 * @param	string	the delimiter that separates each column
 	 * @param	int		the index for where the header row starts
 	 * @param	int		must be greater then the maximum line length. Setting to 0 is slightly slower, but works for any length
-	 * @return	array
+	 * @return	array|false
 	 */
 	function csv_to_array($filename = '', $delimiter =  ',', $header_row = 0, $length = 0)
 	{
diff --git a/fuel/modules/fuel/libraries/Cache.php b/fuel/modules/fuel/libraries/Cache.php
index c88aafd01..e764a9e27 100644
--- a/fuel/modules/fuel/libraries/Cache.php
+++ b/fuel/modules/fuel/libraries/Cache.php
@@ -306,7 +306,7 @@ public function remove_ids($cache_ids, $cache_group = NULL)
 	 * 
 	 * 	@param	Cache ID
 	 * 	@param 	Cache group ID (optional)
-	 * 	@return void
+	 * 	@return int
 	 */
 	protected function _get_expiry($cache_id, $cache_group = NULL)
 	{
@@ -322,7 +322,7 @@ protected function _get_expiry($cache_id, $cache_group = NULL)
 	 * 
 	 * 	@param	Cache ID
 	 * 	@param 	Cache group ID (optional)
-	 * 	@return void
+	 * 	@return string
 	 */
 	protected function _file($cache_id, $cache_group = NULL)
 	{
diff --git a/fuel/modules/fuel/libraries/Curl.php b/fuel/modules/fuel/libraries/Curl.php
index 74aa9ae48..978162f85 100644
--- a/fuel/modules/fuel/libraries/Curl.php
+++ b/fuel/modules/fuel/libraries/Curl.php
@@ -657,7 +657,7 @@ public function has_error($key = FALSE)
 	 *
 	 * @access	public
 	 * @param	string	The URL to use for the CURL session
-	 * @return	void
+	 * @return	boolean
 	 */	
 	public function is_valid($url)
 	{
diff --git a/fuel/modules/fuel/libraries/Data_table.php b/fuel/modules/fuel/libraries/Data_table.php
index aec2d2d56..ea31a6f38 100644
--- a/fuel/modules/fuel/libraries/Data_table.php
+++ b/fuel/modules/fuel/libraries/Data_table.php
@@ -899,7 +899,7 @@ protected function _render_attrs($attrs)
 	 * @access	protected
 	 * @param	array actions
 	 * @param	array columns
-	 * @return	void
+	 * @return	string
 	 */
 	protected function _render_actions($actions, $fields)
 	{
diff --git a/fuel/modules/fuel/libraries/Form_builder.php b/fuel/modules/fuel/libraries/Form_builder.php
index d36f83b0e..6a7198bac 100644
--- a/fuel/modules/fuel/libraries/Form_builder.php
+++ b/fuel/modules/fuel/libraries/Form_builder.php
@@ -1147,7 +1147,7 @@ protected function _open_field_attrs($val)
 	 * 
 	 * @access	protected
 	 * @param	string	
-	 * @return	void
+	 * @return	string
 	 */
 	protected function _render_actions()
 	{
@@ -1214,7 +1214,7 @@ protected function _render_actions()
 	 * 
 	 * @access	protected
 	 * @param	string	
-	 * @return	void
+	 * @return	string
 	 */
 	protected function _close_form($str)
 	{
@@ -3502,7 +3502,7 @@ public function pre_process_field_values()
 	 * Alters all the field post values that have post_process attribute specified
 	 *
 	 * @access	public
-	 * @return	void
+	 * @return	array
 	 */
 	public function post_process_field_values($posted = array(), $set_post = TRUE)
 	{
@@ -4307,7 +4307,7 @@ public function initialize($params = array())
 	 *
 	 * @access	public
 	 * @param	array
-	 * @return	void
+	 * @return	string
 	 */
 	public function render($params = array())
 	{
diff --git a/fuel/modules/fuel/libraries/Fuel.php b/fuel/modules/fuel/libraries/Fuel.php
index 69bf76473..c7a39579e 100644
--- a/fuel/modules/fuel/libraries/Fuel.php
+++ b/fuel/modules/fuel/libraries/Fuel.php
@@ -170,7 +170,7 @@ public function set_config($item, $value = NULL, $module = 'fuel')
 	 *
 	 * @access	public
 	 * @param	string	Value of what part of the version number to return. Options are "major", "minor", or "patch" (optional)
-	 * @return	void
+	 * @return	string
 	 */	
 	public function version($part = NULL)
 	{
diff --git a/fuel/modules/fuel/libraries/Fuel_advanced_module.php b/fuel/modules/fuel/libraries/Fuel_advanced_module.php
index 6c9b72782..b23b91fc0 100644
--- a/fuel/modules/fuel/libraries/Fuel_advanced_module.php
+++ b/fuel/modules/fuel/libraries/Fuel_advanced_module.php
@@ -906,7 +906,7 @@ public function get_cache($cache_id, $cache_group = NULL, $skip_checking = FALSE
 	 */
 	public function clear_cache()
 	{
-		return $this->fuel->cache->clear_module($this->folder());
+		$this->fuel->cache->clear_module($this->folder());
 	}
 
 	// --------------------------------------------------------------------
diff --git a/fuel/modules/fuel/libraries/Fuel_base_library.php b/fuel/modules/fuel/libraries/Fuel_base_library.php
index e6a82e7b9..a92f51d96 100644
--- a/fuel/modules/fuel/libraries/Fuel_base_library.php
+++ b/fuel/modules/fuel/libraries/Fuel_base_library.php
@@ -220,7 +220,7 @@ protected function _add_error($error, $use_lang = FALSE)
 	 * Checks if the logged in user is authenticated to use this item based on specified permission
 	 *
 	 * @access	protected
-	 * @return	void
+	 * @return	boolean
 	 */	
 	protected function _has_permission()
 	{
diff --git a/fuel/modules/fuel/libraries/Fuel_parser.php b/fuel/modules/fuel/libraries/Fuel_parser.php
index cb95ef6e4..45d85d38f 100644
--- a/fuel/modules/fuel/libraries/Fuel_parser.php
+++ b/fuel/modules/fuel/libraries/Fuel_parser.php
@@ -82,7 +82,6 @@ public function initialize($params = array())
 		}
 		$this->set_engine($this->fuel->config('parser_engine'));
 		$this->create_compile_dir();
-		return $this;
 	}
 
 	// --------------------------------------------------------------------
diff --git a/fuel/modules/fuel/libraries/MY_Image_lib.php b/fuel/modules/fuel/libraries/MY_Image_lib.php
index 060353b46..bdb7233c2 100644
--- a/fuel/modules/fuel/libraries/MY_Image_lib.php
+++ b/fuel/modules/fuel/libraries/MY_Image_lib.php
@@ -46,7 +46,7 @@ public function __construct($props = array())
 	 *
 	 * @access	public
 	 * @param	array	an associative array of key/values
-	 * @return	array
+	 * @return	void
 	 */	
 	public function initialize($props = array())
 	{
@@ -65,7 +65,7 @@ public function initialize($props = array())
 	 * Resize and crop an image
 	 *
 	 * @access	public
-	 * @return	array
+	 * @return	boolean
 	 */	
 	public function resize_and_crop()
 	{
@@ -183,7 +183,7 @@ public function resize_and_crop()
 	 * @access	public
 	 * @param	array	an associative array of key/values
 	 * @param	boolean	indicates whether to remove empty array values from uri
-	 * @return	array
+	 * @return	boolean
 	 */	
 	public function convert($type = 'jpg', $delete_orig = FALSE)
 	{
diff --git a/fuel/modules/fuel/models/Base_module_model.php b/fuel/modules/fuel/models/Base_module_model.php
index 4534e0f16..ced03d445 100644
--- a/fuel/modules/fuel/models/Base_module_model.php
+++ b/fuel/modules/fuel/models/Base_module_model.php
@@ -1416,7 +1416,7 @@ public function get_module()
 	 *
 	 * @access	public
 	 * @param	array 	An array of data (optional)
-	 * @return	void
+	 * @return	array
 	 */	
 	public function vars($data = array())
 	{
diff --git a/fuel/modules/fuel/models/Fuel_pages_model.php b/fuel/modules/fuel/models/Fuel_pages_model.php
index 89ed38fa9..d45eab4da 100644
--- a/fuel/modules/fuel/models/Fuel_pages_model.php
+++ b/fuel/modules/fuel/models/Fuel_pages_model.php
@@ -244,7 +244,7 @@ public function find_by_location($location, $just_published = 'yes')
 	 *
 	 * @access	public
 	 * @param  string URI path to start from (e.g. about would find about/history, about/contact, etc)
-	 * @return	void
+	 * @return	array
 	 */	
 	function children($root)
 	{

From d11210b1d0046273ad0c34c067431d953d254a39 Mon Sep 17 00:00:00 2001
From: Martynas Sateika <martynas.sateika@gmail.com>
Date: Sat, 6 Oct 2018 14:42:08 +0100
Subject: [PATCH 117/129] Replace @access with @param where applicable

---
 fuel/modules/fuel/libraries/Fuel_admin.php | 2 +-
 fuel/modules/fuel/libraries/Fuel_auth.php  | 4 ++--
 fuel/modules/fuel/libraries/Fuel_pages.php | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/fuel/modules/fuel/libraries/Fuel_admin.php b/fuel/modules/fuel/libraries/Fuel_admin.php
index 0a2878e5d..b094a95b9 100644
--- a/fuel/modules/fuel/libraries/Fuel_admin.php
+++ b/fuel/modules/fuel/libraries/Fuel_admin.php
@@ -1329,7 +1329,7 @@ public function dashboards()
 	 * Adds a dashboard to the FUEL configuration settings which will be displayed on the dashboard page
 	 *
 	 * @access	public
-	 * @access	string	The name of the module that has the dashboard you want to add
+	 * @param	string	The name of the module that has the dashboard you want to add
 	 * @return	void
 	 */	
 	public function add_dashboard($dashboard)
diff --git a/fuel/modules/fuel/libraries/Fuel_auth.php b/fuel/modules/fuel/libraries/Fuel_auth.php
index c19796950..265242918 100644
--- a/fuel/modules/fuel/libraries/Fuel_auth.php
+++ b/fuel/modules/fuel/libraries/Fuel_auth.php
@@ -145,8 +145,8 @@ public function valid_user()
 	 * Sets session data for the currently logged in user
 	 *
 	 * @access	public
-	 * @access	string	The array key to associate the session data
-	 * @access	mixed	The session data to save
+	 * @param	string	The array key to associate the session data
+	 * @param	mixed	The session data to save
 	 * @return	void
 	 */	
 	public function set_user_data($key, $value)
diff --git a/fuel/modules/fuel/libraries/Fuel_pages.php b/fuel/modules/fuel/libraries/Fuel_pages.php
index 78ce4e8b5..fd51f1b47 100644
--- a/fuel/modules/fuel/libraries/Fuel_pages.php
+++ b/fuel/modules/fuel/libraries/Fuel_pages.php
@@ -308,10 +308,10 @@ public function mode()
 	 * The 3rd parameter can contain Fuel_page class properties (e.g. array('render_mode' => 'cms'))
 	 *
 	 * @access	public
-	 * @access	string	The location value of the page
-	 * @access	array	Variables to pass to the page
-	 * @access	array	Additional initialization parameters to pass to the page
-	 * @access	boolean	Return the result or echo it out
+	 * @param	string	The location value of the page
+	 * @param	array	Variables to pass to the page
+	 * @param	array	Additional initialization parameters to pass to the page
+	 * @param	boolean	Return the result or echo it out
 	 * @return	string
 	 */	
 	public function render($location, $vars = array(), $params = array(), $return = FALSE)

From 1132d70c4de2da2bac13d4649002fcc5def34bec Mon Sep 17 00:00:00 2001
From: David McReynolds <dave@thedaylightstudio.com>
Date: Tue, 9 Oct 2018 12:20:02 -0700
Subject: [PATCH 118/129] =?UTF-8?q?Updates=20to=20Form::prep=20to=20preven?=
 =?UTF-8?q?t=20unnecessarily=20double=20encoding=20=E2=80=9C<=E2=80=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fuel/modules/fuel/libraries/Form.php | 32 ++++++----------------------
 1 file changed, 7 insertions(+), 25 deletions(-)

diff --git a/fuel/modules/fuel/libraries/Form.php b/fuel/modules/fuel/libraries/Form.php
index 21fa4a546..962d0347e 100644
--- a/fuel/modules/fuel/libraries/Form.php
+++ b/fuel/modules/fuel/libraries/Form.php
@@ -238,7 +238,7 @@ public function input($name, $type = 'text', $value = '', $attrs = '')
 	{
 		$attrs = $this->create_attrs($attrs);
 		if (empty($type)) $type = 'text';
-		$elem = new Form_input($type, $name, Form::prep($value), $attrs);
+		$elem = new Form_input($type, $name, Form::prep($value, FALSE), $attrs);
 		return $this->_create_element($elem);
 	}
 
@@ -260,7 +260,7 @@ public function input($name, $type = 'text', $value = '', $attrs = '')
 	 */
 	public function text($name, $value = '', $attrs = '')
 	{
-		return $this->input($name, 'text', Form::prep($value), $attrs);
+		return $this->input($name, 'text', Form::prep($value, FALSE), $attrs);
 	}
 
 	// --------------------------------------------------------------------
@@ -271,7 +271,7 @@ public function text($name, $value = '', $attrs = '')
 	<code>
 	echo $this->form->hidden('password', 'abc134', 'class="txt_field"');
 	// will echo the following
-	<input type="password" name="pwd" id="pwd"  value="" class="txt_field" />
+	<input type="passowrd" name="pwd" id="pwd"  value="" class="txt_field" />
 	</code>
 	 * @access public
 	 * @param string name of the input element
@@ -281,7 +281,7 @@ public function text($name, $value = '', $attrs = '')
 	 */
 	public function password($name, $value = '', $attrs = '')
 	{
-		return $this->input($name, 'password', Form::prep($value), $attrs);
+		return $this->input($name, 'password', Form::prep($value, FALSE), $attrs);
 	}
 
 	// --------------------------------------------------------------------
@@ -302,7 +302,7 @@ public function password($name, $value = '', $attrs = '')
 	 */
 	public function search($name, $value = '', $attrs = '')
 	{
-		return $this->input($name, 'search', Form::prep($value), $attrs);
+		return $this->input($name, 'search', Form::prep($value, FALSE), $attrs);
 	}
 
 	// --------------------------------------------------------------------
@@ -580,29 +580,11 @@ public static function prep($str, $double_encode = TRUE)
 		// clean the string for utf8
 		$CI =& get_instance();
 		$str = $CI->utf8->clean_string($str);
-
-		if ($double_encode === TRUE)
-		{
-			$str = htmlspecialchars($str, ENT_QUOTES, config_item('charset'));
-		}
-		else
-		{
-			// Do not encode existing HTML entities
-			// From PHP 5.2.3 this functionality is built-in, otherwise use a regex
-			if (version_compare(PHP_VERSION, '5.2.3', '>='))
-			{
-				$str = htmlspecialchars($str, ENT_QUOTES, config_item('charset'), FALSE);
-			}
-			else
-			{
-				$str = preg_replace('/&(?!(?:#\d++|[a-z]++);)/ui', '&amp;', $str);
-				//$str = str_replace(array(''\'', '"'), array('&#39;', '&quot;'), $str);
-			}
-		}
+		$str = html_escape($str, $double_encode);
+		
 		return $str;
 	}
 	
-	
 	// --------------------------------------------------------------------
 
 	/**

From c2230a4110917899c6c4897c9313fe30f6c77b6f Mon Sep 17 00:00:00 2001
From: Martynas Sateika <martynas.sateika@gmail.com>
Date: Wed, 10 Oct 2018 20:59:00 +0100
Subject: [PATCH 119/129] Fix incorrect spelling of 'password' in recent commit

---
 fuel/modules/fuel/libraries/Form.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fuel/modules/fuel/libraries/Form.php b/fuel/modules/fuel/libraries/Form.php
index 962d0347e..bd59dc9ee 100644
--- a/fuel/modules/fuel/libraries/Form.php
+++ b/fuel/modules/fuel/libraries/Form.php
@@ -271,7 +271,7 @@ public function text($name, $value = '', $attrs = '')
 	<code>
 	echo $this->form->hidden('password', 'abc134', 'class="txt_field"');
 	// will echo the following
-	<input type="passowrd" name="pwd" id="pwd"  value="" class="txt_field" />
+	<input type="password" name="pwd" id="pwd"  value="" class="txt_field" />
 	</code>
 	 * @access public
 	 * @param string name of the input element

From e01bde31196ed5209f5c03bcff00a1de806efcf7 Mon Sep 17 00:00:00 2001
From: David McReynolds <dave@thedaylightstudio.com>
Date: Tue, 16 Oct 2018 10:54:46 -0700
Subject: [PATCH 120/129] Fix for 7.2 updates and keyval field type

---
 fuel/modules/fuel/libraries/Fuel_custom_fields.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fuel/modules/fuel/libraries/Fuel_custom_fields.php b/fuel/modules/fuel/libraries/Fuel_custom_fields.php
index 2e10f36f2..4c2e522ba 100644
--- a/fuel/modules/fuel/libraries/Fuel_custom_fields.php
+++ b/fuel/modules/fuel/libraries/Fuel_custom_fields.php
@@ -1789,7 +1789,7 @@ public function keyval($params)
 
 	
 		// create an array with the key being the image name and the value being the caption (if it exists... otherwise the image name is used again)
-		$func = function($value) use ($process_key, $params) {
+		$func = function($value) use ($process_key, $params, $row_delimiter, $split_delimiter) {
 			if (is_array($value))
 			{
 				foreach($value as $key => $val)

From 67628a4916cb2ae9fdb425ce46e3f493d72c3275 Mon Sep 17 00:00:00 2001
From: David McReynolds <dave@thedaylightstudio.com>
Date: Tue, 16 Oct 2018 10:59:34 -0700
Subject: [PATCH 121/129] Fix for keyval and splitting on returns including
 \r\n

---
 fuel/modules/fuel/libraries/Fuel_custom_fields.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fuel/modules/fuel/libraries/Fuel_custom_fields.php b/fuel/modules/fuel/libraries/Fuel_custom_fields.php
index 4c2e522ba..5d691d78a 100644
--- a/fuel/modules/fuel/libraries/Fuel_custom_fields.php
+++ b/fuel/modules/fuel/libraries/Fuel_custom_fields.php
@@ -1769,7 +1769,7 @@ public function keyval($params)
 
 		if (!isset($params['row_delimiter']))
 		{
-			$params['row_delimiter'] = "\n|,";
+			$params['row_delimiter'] = "\r\n|\n|,";
 		}
 
 		if (!isset($params['allow_numeric_indexes']))

From 67bf56f795a3eb877ce873ec253792c3943632a6 Mon Sep 17 00:00:00 2001
From: David McReynolds <dave@thedaylightstudio.com>
Date: Tue, 16 Oct 2018 11:43:55 -0700
Subject: [PATCH 122/129] Additional fix for keyval field and hard returns

---
 fuel/modules/fuel/libraries/Fuel_custom_fields.php | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/fuel/modules/fuel/libraries/Fuel_custom_fields.php b/fuel/modules/fuel/libraries/Fuel_custom_fields.php
index 5d691d78a..dd6685fe1 100644
--- a/fuel/modules/fuel/libraries/Fuel_custom_fields.php
+++ b/fuel/modules/fuel/libraries/Fuel_custom_fields.php
@@ -1815,11 +1815,11 @@ public function keyval($params)
 							{
 								$v = $vals[1];
 								$k = $vals[0];
-								$json[$k] = $v;
+								$json[$k] = trim($v);
 							}
 							else
 							{
-								$json[] = $vals[0];
+								$json[] = trim($vals[0]);
 							}
 						}
 						$first_item = current($json);
@@ -1852,11 +1852,11 @@ public function keyval($params)
 							{
 								$val = $vals[1];
 								$key = $vals[0];
-								$json[$key] = $val;
+								$json[$key] = trim($val);
 							}
 							else
 							{
-								$json[] = $vals[0];
+								$json[] = trim($vals[0]);
 							}
 						}
 					}
@@ -1870,6 +1870,11 @@ public function keyval($params)
 
 		if (!empty($params['value']))
 		{
+			// Normalize hard returns
+			// $params['value'] = str_replace("\r\n", "\n", $params['value']);
+
+			// $params['value'] = str_replace("\r", "\n", $params['value']);
+
 			if (is_json_str($params['value']))
 			{
 				$params['value'] = json_decode($params['value'], TRUE);

From 44f49fa41fe536b69951f1a958fdf32035584bde Mon Sep 17 00:00:00 2001
From: David McReynolds <dave@thedaylightstudio.com>
Date: Tue, 16 Oct 2018 13:17:24 -0700
Subject: [PATCH 123/129] Fix for auto filtering based on multiple select

---
 .../fuel/assets/js/fuel/controller/BaseFuelController.js        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fuel/modules/fuel/assets/js/fuel/controller/BaseFuelController.js b/fuel/modules/fuel/assets/js/fuel/controller/BaseFuelController.js
index 2a842aaa4..29ff7e8fa 100755
--- a/fuel/modules/fuel/assets/js/fuel/controller/BaseFuelController.js
+++ b/fuel/modules/fuel/assets/js/fuel/controller/BaseFuelController.js
@@ -303,7 +303,7 @@ fuel.controller.BaseFuelController = jqx.lib.BaseController.extend({
 		});
 		
 		// automatically set selects to submit
-		$('.more_filters select').change(function(e){
+		$('.more_filters select').not('[multiple]').change(function(e){
 			if ($(this).parents().hasClass('adv_search') === false) {
 				$('#form').submit();
 			}

From 1425f47f683163a8263a72fe95ceb2fbb777e500 Mon Sep 17 00:00:00 2001
From: David McReynolds <dave@thedaylightstudio.com>
Date: Tue, 16 Oct 2018 13:54:43 -0700
Subject: [PATCH 124/129] Another fix for keyval custom field due to 7.2
 updates

---
 fuel/modules/fuel/libraries/Fuel_custom_fields.php | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/fuel/modules/fuel/libraries/Fuel_custom_fields.php b/fuel/modules/fuel/libraries/Fuel_custom_fields.php
index dd6685fe1..5b4e30cd7 100644
--- a/fuel/modules/fuel/libraries/Fuel_custom_fields.php
+++ b/fuel/modules/fuel/libraries/Fuel_custom_fields.php
@@ -1842,12 +1842,12 @@ public function keyval($params)
 
 				if (is_string($value))
 				{
-					$rows = preg_split("#'.$row_delimiter.'#", $value);
+					$rows = preg_split("#".$row_delimiter."#", $value);
 					foreach($rows as $r)
 					{
 						if (is_string($r))
 						{
-							$vals = preg_split("#'.$split_delimiter.'#", $r);
+							$vals = preg_split("#".$split_delimiter."#", $r);
 							if (isset($vals[1]))
 							{
 								$val = $vals[1];
@@ -1870,11 +1870,6 @@ public function keyval($params)
 
 		if (!empty($params['value']))
 		{
-			// Normalize hard returns
-			// $params['value'] = str_replace("\r\n", "\n", $params['value']);
-
-			// $params['value'] = str_replace("\r", "\n", $params['value']);
-
 			if (is_json_str($params['value']))
 			{
 				$params['value'] = json_decode($params['value'], TRUE);
@@ -1896,6 +1891,7 @@ public function keyval($params)
 						}
 					}
 				}
+
 				if (!empty($new_value))
 				{
 					$params['value'] = implode("\n", $new_value);	

From 1708459dd728b78dd8fb80b40d29781f8b2a5bb7 Mon Sep 17 00:00:00 2001
From: David McReynolds <dave@thedaylightstudio.com>
Date: Wed, 14 Nov 2018 12:25:01 -0800
Subject: [PATCH 125/129] Fix for error when there is an empty query object

---
 fuel/modules/fuel/core/MY_Model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fuel/modules/fuel/core/MY_Model.php b/fuel/modules/fuel/core/MY_Model.php
index 8e1c20986..2d9d4773e 100755
--- a/fuel/modules/fuel/core/MY_Model.php
+++ b/fuel/modules/fuel/core/MY_Model.php
@@ -480,7 +480,7 @@ public function get($force_array = TRUE, $return_method = NULL, $assoc_key = NUL
 		//Get the data out of the database
 		$query = $this->db->get($this->table_name);
 		
-		if (empty($query)) $query = ($this->db->dbdriver == 'mysql') ? new MY_DB_mysql_result() : new MY_DB_mysqli_result();
+		if (empty($query)) $query = ($this->db->dbdriver == 'mysql') ? new MY_DB_mysql_result($this->db) : new MY_DB_mysqli_result($this->db);
 		
 		if ($this->return_method == 'query') 
 		{

From a76b59cd4c96b19f240315e51277405eb6fb92ce Mon Sep 17 00:00:00 2001
From: David McReynolds <dave@thedaylightstudio.com>
Date: Wed, 14 Nov 2018 21:25:15 -0800
Subject: [PATCH 126/129] Fix for setting markdown editor

---
 fuel/modules/fuel/libraries/Fuel_custom_fields.php | 4 ++--
 fuel/modules/fuel/views/_docs/general/forms.php    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/fuel/modules/fuel/libraries/Fuel_custom_fields.php b/fuel/modules/fuel/libraries/Fuel_custom_fields.php
index 5b4e30cd7..8bb710325 100644
--- a/fuel/modules/fuel/libraries/Fuel_custom_fields.php
+++ b/fuel/modules/fuel/libraries/Fuel_custom_fields.php
@@ -118,9 +118,9 @@ public function wysiwyg($params)
 		}
 
 		// adds markdown controlls to the markItUp!  editor
-		if (isset($params['markdown']) AND $params['markdown'] === TRUE)
+		if (isset($params['markdown']) AND $params['markdown'] === TRUE AND empty($params['editor_config']))
 		{
-			$params['data']['markdown'] = 1;
+			$params['editor_config'] = 'markdown';
 		}
 
 		static $markitup_config;
diff --git a/fuel/modules/fuel/views/_docs/general/forms.php b/fuel/modules/fuel/views/_docs/general/forms.php
index 3378734d7..73795afaf 100644
--- a/fuel/modules/fuel/views/_docs/general/forms.php
+++ b/fuel/modules/fuel/views/_docs/general/forms.php
@@ -883,7 +883,7 @@ function my_custom_field($params)
 		<li><strong>link_filter</strong>: a regular expression value that can be used to filter the page list down to only the pages you need</li>
 		<li><strong>editor_config</strong>: sets the editor's (markItUp! or CKEditor) configuration values for a particular field. Camel-cased attributes need to be converted to lowercase with hyphens (e.g. extraPlugins should be extra-plugins). These configuration values are attached to the textarea field so you can use
 			Javascript to set more complex object values as long they are set on the textarea field before markItUp! or CKEditor initialization (e.g. $('.mytextarea').data('toolbar', [['Bold','Italic','Strike']]).</li>
-		<li><strong>markdown</strong>: changes toolbar to use <a href="http://daringfireball.net/projects/markdown/" target="_blank">Markdown</a> formatting instead of HTML. Must have editor set to use markItUp!</li>
+		<li><strong>markdown</strong>: changes toolbar to use <a href="http://daringfireball.net/projects/markdown/" target="_blank">Markdown</a> formatting instead of HTML. Must have editor set to use markItUp! (NOTE: This is only the editor. You must use the <dfn>markdown()</dfn> function for display in your views.</li>
 	</ul>
 	
 	<h4>Example</h4>

From e8da46866628a9ab176da285063996f140c2e27f Mon Sep 17 00:00:00 2001
From: David McReynolds <dave@thedaylightstudio.com>
Date: Tue, 20 Nov 2018 10:13:13 -0800
Subject: [PATCH 127/129] PHP 7.2 fix for issue #519

---
 fuel/modules/fuel/libraries/Menu.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fuel/modules/fuel/libraries/Menu.php b/fuel/modules/fuel/libraries/Menu.php
index a22816ae5..1a6e7549b 100644
--- a/fuel/modules/fuel/libraries/Menu.php
+++ b/fuel/modules/fuel/libraries/Menu.php
@@ -447,7 +447,7 @@ protected function _render_basic($menu, $level = -1)
 				if (!empty($this->container_tag_id) AND $level == -1) $str .= " id=\"".$this->container_tag_id."\"";
 				if (!empty($container_class)) $str .= " class=\"".$container_class."\"";
 				if (!empty($this->container_tag)) $str .= ">\n";
-				$active_index = (count($this->_active_items) -1) - $level;
+				$active_index = (count((array)$this->_active_items) -1) - $level;
 				$level = $level + 1;
 				$i = 0;
 				

From a0f0aa9fb2bf87a9ae2d167613a2e99b6d49d2af Mon Sep 17 00:00:00 2001
From: David McReynolds <dave@thedaylightstudio.com>
Date: Fri, 30 Nov 2018 08:55:27 -0800
Subject: [PATCH 128/129] Changed blog feed to be https

---
 fuel/modules/fuel/config/fuel.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fuel/modules/fuel/config/fuel.php b/fuel/modules/fuel/config/fuel.php
index 4712ef85c..1059ea3b8 100644
--- a/fuel/modules/fuel/config/fuel.php
+++ b/fuel/modules/fuel/config/fuel.php
@@ -96,7 +96,7 @@
 $config['dashboards'] = array('fuel');
 
 // Dashboard rss
-$config['dashboard_rss'] = 'http://www.getfuelcms.com/blog/feed/rss';
+$config['dashboard_rss'] = 'https://www.getfuelcms.com/blog/feed/rss';
 
 // text editor settings  (options are markitup or ckeditor)
 // markitup: allows you to visualize the code in its raw format - not wysiwyg (http://markitup.jaysalvat.com/)

From 76a6e34a0c6153b346a0748c09858d87a37ca4a8 Mon Sep 17 00:00:00 2001
From: David McReynolds <dave@thedaylightstudio.com>
Date: Fri, 30 Nov 2018 08:56:45 -0800
Subject: [PATCH 129/129] 1.4.3 release

---
 fuel/modules/fuel/config/fuel_constants.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fuel/modules/fuel/config/fuel_constants.php b/fuel/modules/fuel/config/fuel_constants.php
index 12677e50d..92969aea6 100644
--- 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.2');
+define('FUEL_VERSION', '1.4.3');
 if (!defined('MODULES_FOLDER'))
 {
 	define('MODULES_FOLDER', '../../fuel/modules');