diff --git a/workflow/engine/classes/class.wsTools.php b/workflow/engine/classes/class.wsTools.php index 105a58aed..7177e8f67 100755 --- a/workflow/engine/classes/class.wsTools.php +++ b/workflow/engine/classes/class.wsTools.php @@ -295,7 +295,7 @@ class workspaceTools { require_once 'classes/model/Translation.php'; $translation = new Translation(); $information = $translation->getTranslationEnvironments(); - + $arrayLang = array(); foreach ($information as $key => $value) { $arrayLang[] = trim($value['LOCALE']); } diff --git a/workflow/engine/classes/model/Content.php b/workflow/engine/classes/model/Content.php index 997416ea2..31e208f5b 100755 --- a/workflow/engine/classes/model/Content.php +++ b/workflow/engine/classes/model/Content.php @@ -382,7 +382,6 @@ class Content extends BaseContent { FROM CONTENT_BACKUP"); $statement->executeQuery(); - $connection = Propel::getConnection('workflow'); $statement = $connection->prepareStatement("DROP TABLE CONTENT_BACKUP"); $statement->executeQuery(); @@ -419,7 +418,7 @@ class Content extends BaseContent { } function fastInsertContent ($ConCategory, $ConParent, $ConId, $ConLang, $ConValue) { - $ConValue = htmlentities($ConValue, ENT_QUOTES, "UTF-8"); + $ConValue = mysql_real_escape_string($ConValue); $connection = Propel::getConnection('workflow'); $statement = $connection->prepareStatement("INSERT INTO CONTENT_BACKUP ( CON_CATEGORY, CON_PARENT, CON_ID , CON_LANG, CON_VALUE) diff --git a/workflow/engine/classes/model/Translation.php b/workflow/engine/classes/model/Translation.php index 1a0ac3be3..5a50c1b04 100755 --- a/workflow/engine/classes/model/Translation.php +++ b/workflow/engine/classes/model/Translation.php @@ -283,9 +283,8 @@ class Translation extends BaseTranslation { if (file_exists(PATH_CORE . "META-INF" . PATH_SEP . "translation.".$locale)) { G::rm_dir(PATH_DATA . "META-INF" . PATH_SEP . "translation.".$locale); } - - if (file_exists(PATH_CORE . '/content/translations/processmaker.'.$locale.'.po')) { - G::rm_dir(PATH_CORE . '/content/translations/processmaker.'.$locale.'.po'); + if (file_exists(PATH_CORE . PATH_SEP . 'content' . PATH_SEP . 'translations' . PATH_SEP . 'processmaker' . $locale . '.po')) { + G::rm_dir(PATH_CORE . PATH_SEP . 'content' . PATH_SEP . 'translations' . PATH_SEP . 'processmaker' . $locale . '.po'); } } }