chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixing where conditions

Browse Source
skala
Julio Montoya 14 years ago
parent 5ded4085af
commit 465f4ff433
2 changed files with 11 additions and 10 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 11
      main/inc/lib/database.lib.php
  2. 10
      main/inc/lib/database.mysqli.lib.php

11
main/inc/lib/database.lib.php
Unescape View File

@ -1189,7 +1189,7 @@ class Database {
continue;
}
$type_condition = strtolower($type_condition);
switch($type_condition) {
switch ($type_condition) {
case 'where':
foreach ($condition_data as $condition => $value_array) {
if (is_array($value_array)) {
@ -1203,11 +1203,12 @@ class Database {
$clean_values = $value_array;
}
if (!empty($condition) && $clean_values != '') {
if (!empty($condition) && $clean_values != '') {
$condition = str_replace('%',"'@percentage@'", $condition); //replace "%"
$condition = str_replace("'?'","%s", $condition); //we treat everything as string
//just in case
$condition = str_replace("?","%s", $condition); //we treat everything as string
$condition = str_replace("'?'","%s", $condition);
$condition = str_replace("?","%s", $condition);
//Treat conditons as string
$condition = str_replace("%s","'%s'", $condition);
$condition = vsprintf($condition, $clean_values);
$condition = str_replace('@percentage@','%', $condition); //replace "%"
$where_return .= $condition;

10
main/inc/lib/database.mysqli.lib.php
Unescape View File

@ -1140,14 +1140,14 @@ class Database {
}
if (!empty($condition) && $clean_values != '') {
$condition = str_replace('%',"'@percentage@'", $condition); //replace "%"
$condition = str_replace("'?'","%s", $condition); //we treat everything as string
//just in case
$condition = str_replace("?","%s", $condition); //we treat everything as string
$condition = str_replace("'?'","%s", $condition);
$condition = str_replace("?","%s", $condition);
//Treat conditons as string
$condition = str_replace("%s","'%s'", $condition);
$condition = vsprintf($condition, $clean_values);
$condition = str_replace('@percentage@','%', $condition); //replace "%"
$where_return .= $condition;
}
}
} }
if (!empty($where_return)) {
$return_value = " WHERE $where_return" ;
}

Write Preview
Loading…
Cancel
Save