Merge pull request #33 from AlexOConnorHub/hotfix_1.0.3

`str_replace` causes error - now `basename`
ncjoes · Sep 30, 2021 · f82ab2c · f82ab2c
2 parents 402e9ff + 2af8b1f
commit f82ab2c
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/src/OfficeConverter/OfficeConverter.php b/src/OfficeConverter/OfficeConverter.php
@@ -140,10 +140,9 @@ protected function makeCommand($outputDirectory, $outputExtension)
     protected function prepOutput($outdir, $filename, $outputExtension)
     {
         $DS = DIRECTORY_SEPARATOR;
-        $tmpName = ($this->extension ? str_replace($this->extension, '', $this->basename) : $this->basename . '.').$outputExtension;
-        $fileBaseName = basename($filename);
-        if (rename($outdir.$DS.$tmpName, $outdir.$DS.$fileBaseName)) {
-            return $outdir.$DS.$fileBaseName;
+        $tmpName = ($this->extension ? basename($this->basename, $this->extension) : $this->basename . '.').$outputExtension;
+        if (rename($outdir.$DS.$tmpName, $outdir.$DS.$filename)) {
+            return $outdir.$DS.$filename;
         } elseif (is_file($outdir.$DS.$tmpName)) {
             return $outdir.$DS.$tmpName;
         }