Merge pull request #199 from freesewing/develop

Fix for #197 and #198
joostdecock · Dec 14, 2017 · 49549cf · 49549cf
2 parents 02f5c5a + ab73ca9
commit 49549cf
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,20 @@
 ##Fixed
 ##Security
 
+## 1.2.8
+
+**Release date**: 2017-12-14
+
+This is a bugfix release with two small fixes
+
+## Fixed
+
+ - Fix for [Issue #197: Timezone warning in core](https://github.com/freesewing/core/issues/197)
+ - Fix for [Issue #198:
+        Pathstring depends on commands being seperated by spaces, 
+        does not support other whitespace characters
+    ](https://github.com/freesewing/core/issues/198)
+
 ## 1.2.7
 
 **Release date**: 2017-12-10

diff --git a/patterns/Core/Pattern/Pattern.php b/patterns/Core/Pattern/Pattern.php
@@ -69,11 +69,7 @@ public function __construct($units='metric')
             $this->setUnits($units);
             $this->loadParts();
             $this->replace('__TITLE__', isset($this->config['info']['name']) ? $this->config['info']['name'] : NULL);
-            $this->replace('__VERSION__', isset($this->config['info']['version']) ? $this->config['info']['version'] : NULL);
-            $this->replace('__COMPANY__', isset($this->config['info']['company']) ? $this->config['info']['company'] : NULL);
-            $this->replace('__AUTHOR__', isset($this->config['info']['author']) ? $this->config['info']['author'] : NULL);
         }
-        $this->replace('__DATE__', date('l j F Y') !=  null ? date('l j F Y') : NULL);
 
         return $this;
     }

diff --git a/src/Path/Path.php b/src/Path/Path.php
@@ -98,7 +98,7 @@ public function getRender()
      */
     public function setPathstring($path)
     {
-        $this->pathstring = trim(preg_replace('/ {2,}/', ' ', $path));
+        $this->pathstring = trim(preg_replace('/ {2,}/', ' ', str_replace(["\t","\n"], ' ', $path)));
     }
 
     /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -98,7 +98,7 @@ public function getRender() @@
          */
         public function setPathstring($path)
         {
-            $this->pathstring = trim(preg_replace('/ {2,}/', ' ', $path));
+            $this->pathstring = trim(preg_replace('/ {2,}/', ' ', str_replace(["\t","\n"], ' ', $path)));
         }
         /**
@@ Expand Down @@