@@ -64,7 +64,7 @@ |
||
| 64 | 64 | $thumbnail = $joinPoint->getProxy(); |
| 65 | 65 | $thumbnailResource = $thumbnail->getResource(); |
| 66 | 66 | if (!$thumbnailResource) { |
| 67 | - return; |
|
| 67 | + return; |
|
| 68 | 68 | } |
| 69 | 69 | |
| 70 | 70 | $streamMetaData = stream_get_meta_data($thumbnailResource->getStream()); |
@@ -120,11 +120,11 @@ |
||
| 120 | 120 | } |
| 121 | 121 | break; |
| 122 | 122 | } |
| 123 | - $binaryPath = $useGlobalBinary === TRUE ? $this->settings['globalBinaryPath'] . ($this->settings['useGlobalBinaryPath'] === TRUE ? $binaryPath : $library) : $this->packageManager->getPackageOfObject($this)->getResourcesPath() . $binaryRootPath . $binaryPath; |
|
| 124 | - $cmd = escapeshellcmd($binaryPath) . ' ' . $arguments; |
|
| 123 | + $binaryPath = $useGlobalBinary === TRUE ? $this->settings['globalBinaryPath'].($this->settings['useGlobalBinaryPath'] === TRUE ? $binaryPath : $library) : $this->packageManager->getPackageOfObject($this)->getResourcesPath().$binaryRootPath.$binaryPath; |
|
| 124 | + $cmd = escapeshellcmd($binaryPath).' '.$arguments; |
|
| 125 | 125 | $output = []; |
| 126 | 126 | exec($cmd, $output, $result); |
| 127 | - $this->systemLogger->log($cmd . ' (' . ((int)$result === 0 ? 'OK' : 'Error: ' . $result) . ')', LOG_INFO, $output); |
|
| 127 | + $this->systemLogger->log($cmd.' ('.((int)$result === 0 ? 'OK' : 'Error: '.$result).')', LOG_INFO, $output); |
|
| 128 | 128 | } |
| 129 | 129 | |
| 130 | 130 | } |