diff --git a/lib/dml/moodle_database.php b/lib/dml/moodle_database.php index 4c4fa743732..f22636e2377 100644 --- a/lib/dml/moodle_database.php +++ b/lib/dml/moodle_database.php @@ -73,6 +73,9 @@ abstract class moodle_database { protected $last_type; protected $last_extrainfo; + /** internal temporary variable */ + private $fix_sql_params_i; + /** * Contructor - instantiates the database, specifying if it's external (connect to other systems) or no (Moodle DB) * note this has effect to decide if prefix checks must be performed or no @@ -399,6 +402,12 @@ abstract class moodle_database { return preg_replace('/\{([a-z][a-z0-9_]*)\}/', $this->prefix.'$1', $sql); } + /** Internal function */ + private function _fix_sql_params_dollar_callback($match) { + $this->fix_sql_params_i++; + return "\$".$this->fix_sql_params_i; + } + /** * Normalizes sql query parameters and verifies parameters. * @param string $sql query or part of it @@ -492,9 +501,9 @@ abstract class moodle_database { } else if ($target_type & SQL_PARAMS_NAMED) { return array($sql, $finalparams, SQL_PARAMS_NAMED); } else { // $type & SQL_PARAMS_DOLLAR - $sql = preg_replace_callback('/(?fix_sql_params_i = 0; + $sql = preg_replace_callback('/(?fix_sql_params_i = 0; + $sql = preg_replace_callback('/\?/', array($this, '_fix_sql_params_dollar_callback'), $sql); return array($sql, array_values($params), SQL_PARAMS_DOLLAR); // 0-based required } }