diff options
| author | vincent-peugnet <v.peugnet@free.fr> | 2019-03-20 19:19:25 +0100 |
|---|---|---|
| committer | vincent-peugnet <v.peugnet@free.fr> | 2019-03-20 19:19:25 +0100 |
| commit | b32df77047b8b86193aa3f367165265ec6046ae1 (patch) | |
| tree | d89a17460f9d614ef1e65a5159bcfb490240ed84 | |
| parent | 91c8dffc337c1275ed8217f0411e1dc73fa31ad3 (diff) | |
| download | wcms-b32df77047b8b86193aa3f367165265ec6046ae1.tar.gz wcms-b32df77047b8b86193aa3f367165265ec6046ae1.zip | |
1.1.2 fix editby issue
| -rw-r--r-- | app/class/controlleradmin.php | 8 | ||||
| -rw-r--r-- | app/class/controllerart.php | 2 | ||||
| -rw-r--r-- | composer.json | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/app/class/controlleradmin.php b/app/class/controlleradmin.php index f01fbe5..cf2dbc8 100644 --- a/app/class/controlleradmin.php +++ b/app/class/controlleradmin.php @@ -19,7 +19,13 @@ class Controlleradmin extends Controller $defaultartexist = true; } - $globalcss = file_get_contents(Model::GLOBAL_DIR . 'global.css'); + $globalcssfile = Model::GLOBAL_DIR . 'global.css'; + + if(is_file($globalcssfile)) { + $globalcss = file_get_contents($globalcssfile); + } else { + $globalcss = ""; + } $admin = ['artlist' => $artlist, 'defaultartexist' => $defaultartexist, 'globalcss' => $globalcss, 'faviconlist' => $faviconlist]; $this->showtemplate('admin', $admin); diff --git a/app/class/controllerart.php b/app/class/controllerart.php index 95a9d3e..dfdde7f 100644 --- a/app/class/controllerart.php +++ b/app/class/controllerart.php @@ -149,7 +149,7 @@ class Controllerart extends Controller $this->setart($id, 'artedit'); - if ($this->importart() && $this->canedit() && empty($this->art->editby())) { + if ($this->importart() && $this->canedit()) { $tablist = ['main' => $this->art->main(), 'css' => $this->art->css(), 'header' => $this->art->header(), 'nav' => $this->art->nav(), 'aside' => $this->art->aside(), 'footer' => $this->art->footer(), 'body' => $this->art->body(), 'javascript' => $this->art->javascript()]; $faviconlist = $this->mediamanager->listfavicon(); diff --git a/composer.json b/composer.json index ab0f8a6..b08ccac 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "name": "w-cms", "description": "point'n think", - "version": "1.1.1", + "version": "1.1.2", "require": { "michelf/php-markdown": "^1.8", "league/plates": "3.*", |