diff --git a/Makefile b/Makefile index ba8176ffa..7d32f68c4 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ dist: rm -rf tmp quickstart: - vendor/bin/phing -Dversion=$(VERSION) package + php7.4 vendor/bin/phing -Dversion=$(VERSION) package unittest: vendor/bin/phing -Dversion=$(VERSION) phpunitfast diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php index e36fec8f9..e15059cef 100644 --- a/inc/inc.ClassSettings.php +++ b/inc/inc.ClassSettings.php @@ -157,7 +157,7 @@ class Settings { /* {{{ */ // default date format var $_dateformat = "Y-m-d"; // default date/time format - var $_datetimformat = "Y-m-d H:i:s"; + var $_datetimeformat = "Y-m-d H:i:s"; // users are notified about document-changes that took place within the last $_updateNotifyTime seconds var $_updateNotifyTime = 86400; // files with one of the following endings can be viewed online