Merge remote branch 'upstream/master' into PM-2104

This commit is contained in:
dheeyi
2015-04-14 14:13:11 -04:00
15 changed files with 446 additions and 623 deletions

View File

@@ -203,7 +203,7 @@ class webEntryProxy extends HttpProxyController
file_put_contents( $fileName, $template->getOutputContent() );
//creating the third file, only if this wsClient.php file doesn't exists.
$fileName = $pathProcess . 'wsClient.php';
$pluginTpl = PATH_CORE . 'test' . PATH_SEP . 'unit' . PATH_SEP . 'ws' . PATH_SEP . 'wsClient.php';
$pluginTpl = PATH_CORE . "templates" . PATH_SEP . "processes" . PATH_SEP . "wsClient.php";
if (file_exists( $fileName )) {
if (filesize( $fileName ) != filesize( $pluginTpl )) {