From bbeeb12f78ffc97e791b8d90e5e53dc7dbc9e323 Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Fri, 9 Oct 2009 16:33:39 -0600 Subject: [PATCH] Fix some parse/undefined variable errors. --- framework/Image/lib/Horde/Image/Im.php | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/framework/Image/lib/Horde/Image/Im.php b/framework/Image/lib/Horde/Image/Im.php index dc3f46399..3795ba441 100644 --- a/framework/Image/lib/Horde/Image/Im.php +++ b/framework/Image/lib/Horde/Image/Im.php @@ -94,18 +94,17 @@ class Horde_Image_Im extends Horde_Image_Base */ public function raw($convert = false) { - if (!empty($this->_data)) { + if (empty($this->_data) || // If there are no operations, and we already have data, don't // bother writing out files, just return the current data. - if (!$convert && - !count($this->_operations) && - !count($this->_postSrcOperations)) { - return $this->_data; - } - - $tmpin = $this->toFile($this->_data); + (!$convert && + !count($this->_operations) && + !count($this->_postSrcOperations))) { + return $this->_data; } + $tmpin = $this->toFile($this->_data); + // Perform convert command if needed if (count($this->_operations) || count($this->_postSrcOperations) || $convert) { $tmpout = Horde_Util::getTempFile('img', false, $this->_tmpdir); @@ -116,7 +115,7 @@ class Horde_Image_Im extends Horde_Image_Base $this->_logDebug(sprintf("convert command executed by Horde_Image_im::raw(): %s", $command)); exec($command, $output, $retval); if ($retval) { - $this->_logErr(sprintf("Error running command: %s"), $command . "\n" . implode("\n", $output)); + $this->_logErr(sprintf("Error running command: %s", $command . "\n" . implode("\n", $output))); } /* Empty the operations queue */ -- 2.11.0