mirror/php-typemill
1
0
Fork 0
mirror of https://github.com/typemill/typemill.git synced 2025-08-03 04:37:26 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/typemill/typemill

Browse Source
This commit is contained in:
trendschau
2022-01-09 00:15:57 +01:00
parent 7a4be6d40a b2b2202070
commit 08a3206e89
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
system/Controllers/ControllerAuthorMediaApi.php
View File

@@ -469,9 +469,8 @@ class ControllerAuthorMediaApi extends ControllerAuthor
$this->params['markdown'] = '![' . $class . '-video](' . $imageUrl . ' "click to load video"){#' . $videoID. ' .' . $class . '}';
$request = $request->withParsedBody($this->params);
$block = new ControllerAuthorBlockApi($this->c);
if($params['new'])
if($this->params['new'])
{
return $block->addBlock($request, $response, $args);
}

3
system/Controllers/ControllerShared.php
View File

@@ -7,6 +7,7 @@ use Typemill\Models\Folder;
use Typemill\Models\WriteCache;
use Typemill\Models\WriteYaml;
use Typemill\Events\OnPageReady;
use Typemill\Events\OnPagetreeLoaded;
abstract class ControllerShared
{
@@ -226,7 +227,7 @@ abstract class ControllerShared
$this->setStructureLive();
}
$structureLive = $this->structureLive;
$structureLive = $this->c->dispatcher->dispatch('onPagetreeLoaded', new OnPagetreeLoaded($this->structureLive))->getData();
$this->navigation = $this->createNavigation($structureLive);
# cache navigation

3
system/Models/ProcessAssets.php
View File

@@ -105,8 +105,7 @@ class ProcessAssets
public function setFileName($originalname, $type, $overwrite = NULL)
{
$pathinfo = pathinfo($originalname);
$this->extension = strtolower($pathinfo['extension']);
$this->extension = isset($pathinfo['extension']) ? strtolower($pathinfo['extension']) : null;
$this->filename = Folder::createSlug($pathinfo['filename']);
$filename = $this->filename;