summaryrefslogtreecommitdiffstats
path: root/lib/private/app.php
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2015-06-30 12:20:28 +0200
committerMorris Jobke <hey@morrisjobke.de>2015-07-02 13:16:47 +0200
commit2727d9797dae3a7a4b9557225250e3f195e96582 (patch)
tree444dfb78874d4838e488a48a40e25309a03cd933 /lib/private/app.php
parentcaa3210a59ee061824c5a6d5b4dd26e9def115d2 (diff)
downloadnextcloud-server-2727d9797dae3a7a4b9557225250e3f195e96582.tar.gz
nextcloud-server-2727d9797dae3a7a4b9557225250e3f195e96582.zip
Only do the description kung-fu on strings - fixes #17028
Diffstat (limited to 'lib/private/app.php')
-rw-r--r--lib/private/app.php34
1 files changed, 19 insertions, 15 deletions
diff --git a/lib/private/app.php b/lib/private/app.php
index 1a32fcfcf77..d5e07ffdbcc 100644
--- a/lib/private/app.php
+++ b/lib/private/app.php
@@ -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
-
- // 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));
- }
+ 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']);
+
+ $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);
+ // join the single paragraphs with a empty line in between
+ $data['description'] = implode("\n\n", $result);
+ } else {
+ $data['description'] = '';
+ }
}
return $data;