diff --git a/.gitignore b/.gitignore index fd0397579..70d0423f6 100644 --- a/.gitignore +++ b/.gitignore @@ -21,4 +21,5 @@ tests/codeception/_output/* composer.lock bin /tests/codeception/api.suite.yml -/application/logs/ \ No newline at end of file +/application/logs/ +/sparks/* \ No newline at end of file diff --git a/application/libraries/PhrasesLib.php b/application/libraries/PhrasesLib.php index 620a6c948..ebb8682e7 100644 --- a/application/libraries/PhrasesLib.php +++ b/application/libraries/PhrasesLib.php @@ -113,6 +113,16 @@ class PhrasesLib if (isset($app) && isset($sprache)) { $result = $this->ci->PhraseModel->getPhrases($app, $sprache, $phrase, $orgeinheit_kurzbz, $orgform_kurzbz); + + if (is_object($result) && $result->error == EXIT_SUCCESS && is_array($result->retval) && count($result->retval) > 0) + { + $parser = new \Netcarver\Textile\Parser(); + + for ($i = 0; $i < count($result->retval); $i++) + { + $result->retval[$i]->text = $parser->textileThis($result->retval[$i]->text); + } + } } else { diff --git a/composer.json b/composer.json index d99a94082..35ae988d0 100755 --- a/composer.json +++ b/composer.json @@ -84,7 +84,8 @@ "zetacomponents/workflow-database-tiein": "1.*", "zetacomponents/workflow-event-log-tiein": "1.*", "json-forms": "1.4.0", - "wikimedia/composer-merge-plugin": "^1.3" + "wikimedia/composer-merge-plugin": "^1.3", + "netcarver/textile": "3.5.*" }, "require-dev": {