From 6d30c1f607ae2d05be45691358c49b464d45d1c7 Mon Sep 17 00:00:00 2001 From: Martynas Sateika <3257241+martynassateika@users.noreply.github.com> Date: Wed, 2 Sep 2020 23:50:51 +0300 Subject: [PATCH 1/3] Add changes from daylightstudio/FUEL-CMS-Languages#20 --- fuel/modules/fuel/language/english/fuel_lang.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fuel/modules/fuel/language/english/fuel_lang.php b/fuel/modules/fuel/language/english/fuel_lang.php index 43271fde6..fe278e1d2 100644 --- 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 Daylight Studio and built upon the CodeIgniter framework.'; +$lang['fuel_developed_by'] = 'FUEL CMS version %1s is developed by Daylight Studio and built upon the CodeIgniter framework.'; $lang['fuel_copyright'] = 'Copyright © %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 views/_variables/nav.php file OR a JSON file that represents your navigation array. For a reference of the array format, please consult the user guide.'; +$lang['navigation_import_instructions'] = 'The following allows you to import your views/_variables/nav.php file OR a JSON file that represents your navigation array. For a reference of the array format, please consult the user guide.'; $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"; From 40c39628cb6c058ed362f1b7557dca7bf496924b Mon Sep 17 00:00:00 2001 From: David McReynolds Date: Fri, 4 Sep 2020 12:10:01 -0700 Subject: [PATCH 2/3] fix: for issue when no dashboard is set in config (https://forum.getfuelcms.com/discussion/3479/dashboard-simplepie#latest) --- fuel/modules/fuel/helpers/simplepie_helper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fuel/modules/fuel/helpers/simplepie_helper.php b/fuel/modules/fuel/helpers/simplepie_helper.php index 501d932c9..844ee068b 100644 --- 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']; } From 897e0f7c2f7587ad4eb2c1bcbd77f1fbba1d58a4 Mon Sep 17 00:00:00 2001 From: David McReynolds Date: Fri, 4 Sep 2020 13:00:16 -0700 Subject: [PATCH 3/3] fix: regression bug fix introduced in latest SQL injection fix --- fuel/application/views/errors/html/error_db.php | 2 ++ fuel/modules/fuel/config/fuel_constants.php | 2 +- fuel/modules/fuel/models/Base_module_model.php | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/fuel/application/views/errors/html/error_db.php b/fuel/application/views/errors/html/error_db.php index f5a43f638..889da8e7e 100755 --- a/fuel/application/views/errors/html/error_db.php +++ b/fuel/application/views/errors/html/error_db.php @@ -58,7 +58,9 @@

+ +
\ No newline at end of file diff --git a/fuel/modules/fuel/config/fuel_constants.php b/fuel/modules/fuel/config/fuel_constants.php index 89f36e3a2..219cc9887 100644 --- a/fuel/modules/fuel/config/fuel_constants.php +++ b/fuel/modules/fuel/config/fuel_constants.php @@ -1,6 +1,6 @@ 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);