From eb335b4a557a5766df78ff9f214e4723454a45ab Mon Sep 17 00:00:00 2001
From: Peter Rotich <peter@osticket.com>
Date: Sun, 24 Apr 2016 19:46:55 +0000
Subject: [PATCH] orm: Remove references to the retired slot feature
---
include/class.orm.php | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/include/class.orm.php b/include/class.orm.php
index c71f0e1e6..49db531a4 100644
--- a/include/class.orm.php
+++ b/include/class.orm.php
@@ -2269,7 +2269,7 @@ class SqlCompiler {
elseif (is_callable($op))
$filter[] = call_user_func($op, $field, $value, $model);
else
- $filter[] = sprintf($op, $field, $this->input($value, $slot));
+ $filter[] = sprintf($op, $field, $this->input($value));
}
}
$glue = $Q->isOred() ? ' OR ' : ' AND ';
@@ -2536,7 +2536,7 @@ class MySqlCompiler extends SqlCompiler {
* (string) token to be placed into the compiled SQL statement. This
* is a colon followed by a number
*/
- function input($what, $slot=false, $model=false) {
+ function input($what, $model=false) {
if ($what instanceof QuerySet) {
$q = $what->getQuery(array('nosort'=>!($what->limit || $what->offset)));
// Rewrite the parameter numbers so they fit the parameter numbers
@@ -2868,7 +2868,7 @@ class MySqlCompiler extends SqlCompiler {
$table = $model::getMeta('table');
$set = array();
foreach ($what as $field=>$value)
- $set[] = sprintf('%s = %s', $this->quote($field), $this->input($value, false, $model));
+ $set[] = sprintf('%s = %s', $this->quote($field), $this->input($value, $model));
$set = implode(', ', $set);
list($where, $having) = $this->getWhereHavingClause($queryset);
$joins = $this->getJoins($queryset);
--
GitLab