[ticket/571] Fix incorrect cast to integer in database_handler

B3P-571
This commit is contained in:
Marc Alexander
2015-06-06 16:33:50 +02:00
parent 7d5128db80
commit 0665dba08f
3 changed files with 8 additions and 5 deletions

View File

@@ -97,6 +97,9 @@ class database_handler
*/
public function move_module_vertical($module_id, $module_data, $direction, $step = 1)
{
$direction = (int) $direction;
$step = (int) $step;
if ($direction == self::MOVE_DIRECTION_DOWN)
{
$current_increment = ' + ' . $step;
@@ -109,15 +112,15 @@ class database_handler
}
$sql = 'UPDATE ' . PORTAL_MODULES_TABLE . '
SET module_order = module_order' . (int) $other_increment . '
WHERE module_order = ' . (int) ($module_data['module_order'] + ($direction * $step)) . '
SET module_order = module_order' . $other_increment . '
WHERE module_order = ' . ($module_data['module_order'] + ($direction * $step)) . '
AND module_column = ' . (int) $module_data['module_column'];
$this->db->sql_query($sql);
$updated = (bool) $this->db->sql_affectedrows();
if ($updated)
{
$sql = 'UPDATE ' . PORTAL_MODULES_TABLE . '
SET module_order = module_order' . (int) $current_increment . '
SET module_order = module_order' . $current_increment . '
WHERE module_id = ' . (int) $module_id;
$this->db->sql_query($sql);
}

View File

@@ -393,6 +393,6 @@ class manager
*/
public function get_module_link($mode, $module_id)
{
return preg_replace(array('/i=[0-9]+/', '/mode=[a-zA-Z0-9_]+/'), array('i=%5C' . str_replace('\\', '-', $this->acp_class), 'mode=' . $mode), $this->u_action) . (($module_id) ? '&module_id=' . $module_id : '');
return preg_replace(array('/i=[0-9]+/', '/mode=[a-zA-Z0-9_]+/'), array('i=-' . str_replace('\\', '-', $this->acp_class), 'mode=' . $mode), $this->u_action) . (($module_id) ? '&module_id=' . $module_id : '');
}
}