Infra-Mirrors/BookStack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2024-07-17 00:32:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v0.14'

Browse Source
This commit is contained in:
Dan Brown 2017-02-01 22:28:38 +00:00
commit 2431ce9f86
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Repos/EntityRepo.php
View File

@ -332,12 +332,12 @@ class EntityRepo
$parents[$key] = $entities[$index]; $parents[$key] = $entities[$index];
$parents[$key]->setAttribute('pages', collect()); $parents[$key]->setAttribute('pages', collect());
} }
if ($entities[$index]->chapter_id === 0) $tree[] = $entities[$index]; if ($entities[$index]->chapter_id === 0 || $entities[$index]->chapter_id === '0') $tree[] = $entities[$index];
$entities[$index]->book = $book; $entities[$index]->book = $book;
} }
foreach ($entities as $entity) { foreach ($entities as $entity) {
if ($entity->chapter_id === 0) continue; if ($entity->chapter_id === 0 || $entity->chapter_id === '0') continue;
$parentKey = 'BookStack\\Chapter:' . $entity->chapter_id; $parentKey = 'BookStack\\Chapter:' . $entity->chapter_id;
$chapter = $parents[$parentKey]; $chapter = $parents[$parentKey];
$chapter->pages->push($entity); $chapter->pages->push($entity);

2
app/User.php
View File

@ -165,7 +165,7 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
if ($imageId === 0 || $imageId === '0' || $imageId === null) return $default; if ($imageId === 0 || $imageId === '0' || $imageId === null) return $default;
try { try {
$avatar = baseUrl($this->avatar->getThumb($size, $size, false)); $avatar = $this->avatar ? baseUrl($this->avatar->getThumb($size, $size, false)) : $default;
} catch (\Exception $err) { } catch (\Exception $err) {
$avatar = $default; $avatar = $default;
} }

4
composer.json
View File

@ -49,7 +49,9 @@
], ],
"post-install-cmd": [ "post-install-cmd": [
"Illuminate\\Foundation\\ComposerScripts::postInstall", "Illuminate\\Foundation\\ComposerScripts::postInstall",
"php artisan optimize" "php artisan optimize",
"php artisan cache:clear",
"php artisan view:clear"
], ],
"post-update-cmd": [ "post-update-cmd": [
"Illuminate\\Foundation\\ComposerScripts::postUpdate", "Illuminate\\Foundation\\ComposerScripts::postUpdate",

5
resources/assets/sass/_text.scss
View File

@ -119,6 +119,11 @@ sup, .superscript {
font-size: 0.8em; font-size: 0.8em;
} }
sub, .subscript {
vertical-align: sub;
font-size: 0.8em;
}
pre { pre {
font-family: monospace; font-family: monospace;
white-space:pre; white-space:pre;