Method getPhrases of library PhrasesLib now returns the text of a phrase

converted from textile to html
This commit is contained in:
paolo
2016-07-06 16:07:17 +02:00
parent 925bb10efa
commit ba1c637ca4
3 changed files with 14 additions and 2 deletions
+2 -1
View File
@@ -21,4 +21,5 @@ tests/codeception/_output/*
composer.lock
bin
/tests/codeception/api.suite.yml
/application/logs/
/application/logs/
/sparks/*
+10
View File
@@ -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
{
+2 -1
View File
@@ -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":
{