From d383856c7722368f70454176b822a7310b51391a Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared@osticket.com>
Date: Fri, 10 Jul 2015 11:06:37 -0500
Subject: [PATCH] oops: Fix PHP warning
---
include/class.orm.php | 4 ++--
scp/css/scp.css | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/include/class.orm.php b/include/class.orm.php
index 588ccca52..7152745ab 100644
--- a/include/class.orm.php
+++ b/include/class.orm.php
@@ -1078,7 +1078,7 @@ class QuerySet implements IteratorAggregate, ArrayAccess, Serializable, Countabl
return $this->_count = $compiler->compileCount($this);
}
- function toSql($compiler, $model, $alias) {
+ function toSql($compiler, $model, $alias=false) {
// FIXME: Force root model of the compiler to $model
$exec = $this->getQuery(array('compiler' => get_class($compiler),
'parent' => $compiler, 'subquery' => true));
@@ -1229,7 +1229,7 @@ class {$classname} extends VerySimpleModel {
}
static function getSqlAddParams(\$compiler) {
- return static::\$queryset->toSql(\$compiler);
+ return static::\$queryset->toSql(\$compiler, self::\$queryset->model);
}
}
EOF;
diff --git a/scp/css/scp.css b/scp/css/scp.css
index 54e091936..89e880e0d 100644
--- a/scp/css/scp.css
+++ b/scp/css/scp.css
@@ -984,6 +984,7 @@ img.avatar {
}
.thread-body .attachments .filesize {
margin-left: 0.5em;
+ line-height: 1em;
}
.thread-body .attachment-info {
margin-right: 10px;
--
GitLab