Merge branch 'release/1.4.11'

daylightstudio · Sep 4, 2020 · 7942b54 · 7942b54
2 parents 6f36348 + 897e0f7
commit 7942b54
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/fuel/application/views/errors/html/error_db.php b/fuel/application/views/errors/html/error_db.php
@@ -58,7 +58,9 @@
 <body>
 	<div id="container">
 		<h1><?php echo $heading; ?></h1>
+		<?php if (is_dev_mode()) : ?>
 		<?php echo $message; ?>
+		<?php endif; ?>
 	</div>
 </body>
 </html>
diff --git a/fuel/modules/fuel/config/fuel_constants.php b/fuel/modules/fuel/config/fuel_constants.php
@@ -1,6 +1,6 @@
 <?php 
 // INSTALL_ROOT is defined in the index.php bootstrap file
-define('FUEL_VERSION', '1.4.10');
+define('FUEL_VERSION', '1.4.11');
 if (!defined('MODULES_FOLDER'))
 {
 	define('MODULES_FOLDER', '../../fuel/modules');

diff --git a/fuel/modules/fuel/helpers/simplepie_helper.php b/fuel/modules/fuel/helpers/simplepie_helper.php
@@ -90,7 +90,7 @@ function simplepie($feed, $limit = 5, $params = array())
 		$CI->simplepie->handle_content_type();
 		$feed_data = $CI->simplepie->get_items(0, $limit);
 		$latest_fuel_version = $CI->simplepie->get_channel_tags('', 'latestFuelVersion');
-		if ( ! is_null($latest_fuel_version[0]))
+		if ((!empty($latest_fuel_version)) && (!is_null($latest_fuel_version[0])))
 		{
 			$feed_data['latest_fuel_version'] = $latest_fuel_version[0]['data'];
 		}

diff --git a/fuel/modules/fuel/language/english/fuel_lang.php b/fuel/modules/fuel/language/english/fuel_lang.php
@@ -8,7 +8,7 @@
 $lang['fuel_page_title'] = 'FUEL CMS';
 $lang['logged_in_as'] = 'Logged in as:';
 $lang['logout'] = 'Logout';
-$lang['fuel_developed_by'] = 'FUEL CMS version %1s is developed by <a href="http://www.thedaylightstudio.com" target="_blank">Daylight Studio</a> and built upon the <a href="http://www.codeigniter.com" target="_blank">CodeIgniter</a> framework.';
+$lang['fuel_developed_by'] = 'FUEL CMS version %1s is developed by <a href="https://www.thedaylightstudio.com" target="_blank">Daylight Studio</a> and built upon the <a href="https://www.codeigniter.com" target="_blank">CodeIgniter</a> framework.';
 $lang['fuel_copyright'] = 'Copyright &copy; %1s Daylight Studio. All Rights Reserved.';
 
 
@@ -305,7 +305,7 @@
 */
 $lang['navigation_import'] = 'Import Navigation';
 $lang['navigation_instructions'] = 'Here you create and edit the top menu items of the page.';
-$lang['navigation_import_instructions'] = 'The following allows you to import your <code>views/_variables/nav.php</code> file OR a JSON file that represents your navigation array. For a reference of the array format, please consult the <a href="http://docs.getfuelcms.com/general/navigation" target="_blank">user guide</a>.';
+$lang['navigation_import_instructions'] = 'The following allows you to import your <code>views/_variables/nav.php</code> file OR a JSON file that represents your navigation array. For a reference of the array format, please consult the <a href="https://docs.getfuelcms.com/general/navigation" target="_blank">user guide</a>.';
 $lang['navigation_import_file_comment'] = 'If no file is uploaded, it will default to the views/_variables/nav.php file. The file must be a JSON file';
 $lang['navigation_success_upload'] = 'The navigation was successfully uploaded.';
 $lang['form_label_navigation_group'] = 'Navigation Group:';
@@ -639,8 +639,8 @@
 $lang['install_success'] = 'Your FUEL CMS installation is complete!';
 $lang['install_success_with_errors'] = "Your FUEL CMS installation is complete but the follow ERRORS did occur:\n%1s";
 $lang['install_further_info'] = "Now, to access the FUEL CMS admin, browse to your installation folder in your browser enter '/fuel' (e.g. localhost/fuel) in your location bar.\n";
-$lang['install_further_info'] .= "For additional configuration options, go to http://docs.getfuelcms.com/installation/configuration.\n";
-$lang['install_further_info'] .= "For questions, or bug reports, go to https://github.com/daylightstudio/FUEL-CMS/issues or visit us at http://forums.getfuelcms.com.\n";
+$lang['install_further_info'] .= "For additional configuration options, go to https://docs.getfuelcms.com/installation/configuration.\n";
+$lang['install_further_info'] .= "For questions, or bug reports, go to https://github.com/daylightstudio/FUEL-CMS/issues or visit us at https://forums.getfuelcms.com.\n";
 
 $lang['update_cli_intro'] = "FUEL CMS 1.4x is built on CodeIgniter 3. If you are upgrading from 1.3x or earlier, this updater will help fix some of the common issues when upgrading including:\n";
 $lang['update_cli_intro'] .= "1) Upper-case first letter for models, libraries and controller file names.\n";

diff --git a/fuel/modules/fuel/models/Base_module_model.php b/fuel/modules/fuel/models/Base_module_model.php
@@ -333,7 +333,8 @@ public function list_items($limit = NULL, $offset = 0, $col = 'id', $order = 'as
 			$this->db->select($this->table_name.'.*'); // make select table specific
 		}
 
-		if (!empty($col)) $this->db->order_by($this->db->escape($col), $this->db->escape($order), FALSE);
+		$escape_order_by = (property_exists($this, 'escape_order_by')) ? $this->escape_order_by : TRUE;
+		if (!empty($col)) $this->db->order_by($col, $order, $escape_order_by);
 		if (!empty($limit)) $this->db->limit((int) $limit);
 		$this->db->offset((int)$offset);