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

Version 1.2.18: Discard Changes and more Inline Elements

Browse Source
This commit is contained in:
trendschau
2019-11-11 20:12:45 +01:00
parent b1dfc56589
commit dbde275062
23 changed files with 1134 additions and 987 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
system/Controllers/ContentApiController.php
View File

@@ -176,12 +176,15 @@ class ContentApiController extends ContentController
# set item
if(!$this->setItem()){ return $response->withJson($this->errors, 404); }
# set redirect url to edit page
$url = $this->uri->getBaseUrl() . '/tm/content/' . $this->settings['editor'] . $this->item->urlRel;
# remove the unpublished changes
$delete = $this->deleteContentFiles(['txt']);
# set redirect url to edit page
$url = $this->uri->getBaseUrl() . '/tm/content/' . $this->settings['editor'] . $this->item->urlRelWoF;
# remove the unpublished changes
$delete = $this->deleteContentFiles(['txt']);
if($delete)
{
# update the backend structure

3
system/Controllers/SetupController.php
View File

@@ -29,12 +29,13 @@ class SetupController extends Controller
$systemcheck['error'][] = 'The PHP-version of your server is ' . phpversion() . ' and Typemill needs at least 7.0.0';
}
# check if mod rewrite is enabled
/* check if mod rewrite is enabled, does not work with PHP-fpm or NGINX
$modules = apache_get_modules();
if(!in_array('mod_rewrite', $modules))
{
$systemcheck['error'][] = 'The apache module "mod_rewrite" is not enabled.';
}
*/
# check if GD extension is enabled
if(!extension_loaded('gd')){