From b0b98075917938f7ae9812ee3dee4db904a94b5f Mon Sep 17 00:00:00 2001 From: Peter Rotich <peter@osticket.com> Date: Tue, 9 Dec 2014 22:31:21 +0000 Subject: [PATCH] lint: oopses --- include/class.attachment.php | 5 +++-- include/class.task.php | 2 +- include/class.thread.php | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/include/class.attachment.php b/include/class.attachment.php index a1ecfd97a..b602b451c 100644 --- a/include/class.attachment.php +++ b/include/class.attachment.php @@ -78,11 +78,12 @@ class Attachment { static function lookup($var, $objectId=0) { - $id = is_numeric($var) ? $var : self::getIdByFileHash($var, $oid); + $id = is_numeric($var) ? $var : self::getIdByFileHash($var, + $objectId); return ($id && is_numeric($id) - && ($attach = new Attachment($id, $oid)) + && ($attach = new Attachment($id, $objectId)) && $attach->getId()==$id ) ? $attach : null; } diff --git a/include/class.task.php b/include/class.task.php index 29f947a46..57767a41f 100644 --- a/include/class.task.php +++ b/include/class.task.php @@ -278,7 +278,7 @@ class Task extends TaskModel { $vars['staffId'] = $thisstaff->getId(); $vars['poster'] = $thisstaff; if (!$vars['ip_address'] && $_SERVER['REMOTE_ADDR']) - $vars['ip_address'] = $SERVER['REMOTE_ADDR']; + $vars['ip_address'] = $_SERVER['REMOTE_ADDR']; $thread->addDescription($vars); diff --git a/include/class.thread.php b/include/class.thread.php index 1caeab492..e6bf896e0 100644 --- a/include/class.thread.php +++ b/include/class.thread.php @@ -486,7 +486,7 @@ Class ThreadEntry { if(!$error) $error = sprintf(_S('Unable to import attachment - %s'), $attachment['name']); - //FIXME: $this->logComment(); + //FIXME: logComment here $this->getThread()->getObject()->logNote( _S('File Import Error'), $error, _S('SYSTEM'), false); } -- GitLab