Merge pull request #10 from thib66/fix-php7.3-regexp-hyphen

glynhudson · web-flow · commit 581053284391 · 2019-04-24T15:41:20.000+01:00
Fix php7.3 regexp hyphen
diff --git a/postprocess-module/postprocess_controller.php b/postprocess-module/postprocess_controller.php
@@ -225,7 +225,7 @@ function postprocess_controller()
            }
            
            if ($option['type']=="newfeed") {
-               $newfeedname = preg_replace('/[^\w\s-:]/','',$params->$key);
+               $newfeedname = preg_replace('/[^\w\s\-:]/','',$params->$key);
                if ($params->$key=="")
                    return array('content'=>"new feed name is blank");
                if ($newfeedname!=$params->$key)
diff --git a/postprocess-module/postprocess_model.php b/postprocess-module/postprocess_model.php
@@ -25,7 +25,7 @@ public function __construct($mysqli)
     public function set($userid,$data)
     {
         $userid = (int) $userid;
-        // $data = preg_replace('/[^\w\s-.",:#{}\[\]]/','',$data);
+        // $data = preg_replace('/[^\w\s\-.",:#{}\[\]]/','',$data);
         $data = json_encode($data);
         
         if ($this->get($userid)===false) {

Original file line number	Diff line number	Diff line change
`@@ -225,7 +225,7 @@ function postprocess_controller()`
`225`	`225`	`}`
`226`	`226`
`227`	`227`	`if ($option['type']=="newfeed") {`
`228`		`- $newfeedname = preg_replace('/[^\w\s-:]/','',$params->$key);`
	`228`	`+ $newfeedname = preg_replace('/[^\w\s\-:]/','',$params->$key);`
`229`	`229`	`if ($params->$key=="")`
`230`	`230`	`return array('content'=>"new feed name is blank");`
`231`	`231`	`if ($newfeedname!=$params->$key)`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public function __construct($mysqli)`
`25`	`25`	`public function set($userid,$data)`
`26`	`26`	`{`
`27`	`27`	`$userid = (int) $userid;`
`28`		`- // $data = preg_replace('/[^\w\s-.",:#{}\[\]]/','',$data);`
	`28`	`+ // $data = preg_replace('/[^\w\s\-.",:#{}\[\]]/','',$data);`
`29`	`29`	`$data = json_encode($data);`
`30`	`30`
`31`	`31`	`if ($this->get($userid)===false) {`