mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #17252 from owncloud/fix-php-errors-in-app-description 

Only do the description kung-fu on strings
This commit is contained in:
Morris Jobke 2015-07-01 15:44:21 +02:00
parent 709eca2085 aae55174f6
commit bad499baad
2 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
lib/private/app.php
View File

@ -1223,23 +1223,27 @@ class OC_App {
// just modify the description if it is available
// otherwise this will create a $data element with an empty 'description'
if (isset($data['description'])) {
// sometimes the description contains line breaks and they are then also
// shown in this way in the app management which isn't wanted as HTML
// manages line breaks itself
if (is_string($data['description'])) {
// sometimes the description contains line breaks and they are then also
// shown in this way in the app management which isn't wanted as HTML
// manages line breaks itself
// first of all we split on empty lines
$paragraphs = preg_split("!\n[[:space:]]*\n!mu", $data['description']);
// first of all we split on empty lines
$paragraphs = preg_split("!\n[[:space:]]*\n!mu", $data['description']);
$result = [];
foreach ($paragraphs as $value) {
// replace multiple whitespace (tabs, space, newlines) inside a paragraph
// with a single space - also trims whitespace
$result[] = trim(preg_replace('![[:space:]]+!mu', ' ', $value));
$result = [];
foreach ($paragraphs as $value) {
// replace multiple whitespace (tabs, space, newlines) inside a paragraph
// with a single space - also trims whitespace
$result[] = trim(preg_replace('![[:space:]]+!mu', ' ', $value));
}
// join the single paragraphs with a empty line in between
$data['description'] = implode("\n\n", $result);
} else {
$data['description'] = '';
}
// join the single paragraphs with a empty line in between
$data['description'] = implode("\n\n", $result);
}
return $data;

4
tests/lib/app.php
View File

@ -510,6 +510,10 @@ class Test_App extends \Test\TestCase {
['not-a-description' => " \t This is a multiline \n test with \n \t some new lines "],
['not-a-description' => " \t This is a multiline \n test with \n \t some new lines "]
],
[
['description' => [100, 'bla']],
['description' => ""]
],
];
}