Merge commit 'a78f0e19fe49c9036f0b3e2dbfc0d562715cc63f' into HEAD

schmunk42 · schmunk42 · commit 1b2275ee0a66 · 2017-01-30T14:46:11.000+01:00
diff --git a/console/controllers/MysqlController.php b/console/controllers/MysqlController.php
@@ -341,7 +341,7 @@ private function execute($cmd)
     }
 
     private function getFilePrefix(){
-        return 'm'.gmdate('ymd_His').'_'.\Yii::$app->id.(defined('APP_VERSION')?'_'.APP_VERSION:'');
+        return 'm'.gmdate('ymd_His').'_'.\Yii::$app->id.(defined('APP_VERSION')?'_'.trim(APP_VERSION):'');
     }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -341,7 +341,7 @@ private function execute($cmd)`
`341`	`341`	`}`
`342`	`342`
`343`	`343`	`private function getFilePrefix(){`
`344`		`- return 'm'.gmdate('ymd_His').'_'.\Yii::$app->id.(defined('APP_VERSION')?'_'.APP_VERSION:'');`
	`344`	`+ return 'm'.gmdate('ymd_His').'_'.\Yii::$app->id.(defined('APP_VERSION')?'_'.trim(APP_VERSION):'');`
`345`	`345`	`}`
`346`	`346`
`347`	`347`	`}`