Skip to content

Commit

Permalink
Merge branch 'release/v1.4.10'
Browse files Browse the repository at this point in the history
  • Loading branch information
David McReynolds committed Aug 25, 2020
2 parents fa82c38 + c8d9381 commit cfd32bc
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion fuel/modules/fuel/config/fuel_constants.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
// INSTALL_ROOT is defined in the index.php bootstrap file
define('FUEL_VERSION', '1.4.9');
define('FUEL_VERSION', '1.4.10');
if (!defined('MODULES_FOLDER'))
{
define('MODULES_FOLDER', '../../fuel/modules');
Expand Down
2 changes: 1 addition & 1 deletion fuel/modules/fuel/models/Base_module_model.php
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@ 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(str_replace(' ', '', $col), str_replace(' ', '', $order), FALSE);
if (!empty($col)) $this->db->order_by($this->db->escape($col), $this->db->escape($order), FALSE);
if (!empty($limit)) $this->db->limit((int) $limit);
$this->db->offset((int)$offset);

Expand Down

0 comments on commit cfd32bc

Please sign in to comment.