diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/l10n/id.js | 1 | ||||
| -rw-r--r-- | lib/l10n/id.json | 1 | ||||
| -rw-r--r-- | lib/private/Comments/Manager.php | 28 | ||||
| -rw-r--r-- | lib/private/Preview/Bitmap.php | 2 |
4 files changed, 20 insertions, 12 deletions
diff --git a/lib/l10n/id.js b/lib/l10n/id.js index f7f729e2f51..f1d50d6e98d 100644 --- a/lib/l10n/id.js +++ b/lib/l10n/id.js @@ -5,6 +5,7 @@ OC.L10N.register( "See %s" : "Lihat %s", "Sample configuration detected" : "Konfigurasi sampel ditemukan", "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Ditemukan bahwa konfigurasi sampel telah disalin. Hal ini dapat merusak instalasi Anda dan tidak didukung. Silahkan baca dokumentasi sebelum melakukan perubahan pada config.php", + "Other activities" : "Aktifitas lain", "PHP %s or higher is required." : "Diperlukan PHP %s atau yang lebih tinggi.", "PHP with a version lower than %s is required." : "Diperlukan PHP dengan versi yang lebh rendah dari %s.", "%sbit or higher PHP required." : "PHP %sbit atau yang lebih tinggi diperlukan.", diff --git a/lib/l10n/id.json b/lib/l10n/id.json index a5f607037ea..71ec29b073d 100644 --- a/lib/l10n/id.json +++ b/lib/l10n/id.json @@ -3,6 +3,7 @@ "See %s" : "Lihat %s", "Sample configuration detected" : "Konfigurasi sampel ditemukan", "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Ditemukan bahwa konfigurasi sampel telah disalin. Hal ini dapat merusak instalasi Anda dan tidak didukung. Silahkan baca dokumentasi sebelum melakukan perubahan pada config.php", + "Other activities" : "Aktifitas lain", "PHP %s or higher is required." : "Diperlukan PHP %s atau yang lebih tinggi.", "PHP with a version lower than %s is required." : "Diperlukan PHP dengan versi yang lebh rendah dari %s.", "%sbit or higher PHP required." : "PHP %sbit atau yang lebih tinggi diperlukan.", diff --git a/lib/private/Comments/Manager.php b/lib/private/Comments/Manager.php index 3275658d555..4a06ac62f1e 100644 --- a/lib/private/Comments/Manager.php +++ b/lib/private/Comments/Manager.php @@ -110,18 +110,24 @@ class Manager implements ICommentsManager { $data['children_count'] = (int)$data['children_count']; $data['reference_id'] = $data['reference_id'] ?? null; if ($this->supportReactions()) { - $list = json_decode($data['reactions'], true); - // Ordering does not work on the database with group concat and Oracle, - // So we simply sort on the output. - if (is_array($list)) { - uasort($list, static function ($a, $b) { - if ($a === $b) { - return 0; - } - return ($a > $b) ? -1 : 1; - }); + if ($data['reactions'] !== null) { + $list = json_decode($data['reactions'], true); + // Ordering does not work on the database with group concat and Oracle, + // So we simply sort on the output. + if (is_array($list)) { + uasort($list, static function ($a, $b) { + if ($a === $b) { + return 0; + } + return ($a > $b) ? -1 : 1; + }); + $data['reactions'] = $list; + } else { + $data['reactions'] = []; + } + } else { + $data['reactions'] = []; } - $data['reactions'] = $list; } return $data; } diff --git a/lib/private/Preview/Bitmap.php b/lib/private/Preview/Bitmap.php index 3a4108664dd..f7c8cf3543b 100644 --- a/lib/private/Preview/Bitmap.php +++ b/lib/private/Preview/Bitmap.php @@ -55,7 +55,7 @@ abstract class Bitmap extends ProviderV2 { try { $bp = $this->getResizedPreview($tmpPath, $maxX, $maxY); } catch (\Exception $e) { - \OC::$server->get(LoggerInterface::class)->error( + \OC::$server->get(LoggerInterface::class)->info( 'File: ' . $file->getPath() . ' Imagick says:', [ 'exception' => $e, |