diff --git a/.github/issue_template.md b/.github/issue_template.md index edd96871..e21c69f2 100644 --- a/.github/issue_template.md +++ b/.github/issue_template.md @@ -7,10 +7,13 @@ Complete here. ### Bludit version Complete here. +### Hosting or Webserver name +Complete here. + ### PHP version If you do not know delete this line. ### PHP logs If you do not know delete this line. -The default settings of the PHP Error Log file varies from OS to OS. The location of the error log file itself can be set manually in the php.ini file. On a Windows server, in IIS, it may be something like `error_log = C:\log_files\php_errors.log` in Linux it may be a value of `/var/log/php_errors.log`. +The default settings for the PHP error log file vary from operating system to system. The location of the error log file itself can be set manually in the php.ini file. On a Windows server, in IIS, it may be something like `error_log = C:\log_files\php_errors.log` in Linux it may be a value of `/var/log/php_errors.log`. diff --git a/.gitignore b/.gitignore index e57370ed..7db06cf5 100644 --- a/.gitignore +++ b/.gitignore @@ -30,4 +30,4 @@ bl-themes/small bl-themes/future-imperfect bl-themes/social-network Dockerfile -conf/* \ No newline at end of file +conf/* diff --git a/README.md b/README.md index e7a66cf0..2e137a22 100644 --- a/README.md +++ b/README.md @@ -39,5 +39,5 @@ PHPStan ------- https://phpstan.org/ ``` -docker run --rm -v $(pwd):/app ghcr.io/phpstan/phpstan:0.12.89 analyse -c /app/phpstan.neon /app +docker run --rm -v $(pwd):/app ghcr.io/phpstan/phpstan:0.12.96 analyse -c /app/phpstan.neon /app ``` \ No newline at end of file diff --git a/bl-kernel/abstract/dbjson.class.php b/bl-kernel/abstract/dbjson.class.php index da9f989c..70feeaa7 100644 --- a/bl-kernel/abstract/dbjson.class.php +++ b/bl-kernel/abstract/dbjson.class.php @@ -6,6 +6,7 @@ class dbJSON { public $dbBackup; public $file; public $firstLine; + protected $dbFields; // These fields are defined in the extended classes // $file, the JSON file. // $firstLine, TRUE if you want to remove the first line, FALSE otherwise @@ -101,7 +102,7 @@ class dbJSON { { // NULL is returned if the json cannot be decoded $decode = json_decode($data, true); - if ($decode===NULL) { + if ($decode===null) { Log::set(__METHOD__.LOG_SEP.'Error trying to read the JSON file: '.$this->file, LOG_TYPE_ERROR); return false; } diff --git a/bl-kernel/admin/themes/booty/css/99-lightmode.css b/bl-kernel/admin/themes/booty/css/99-lightmode.css index 29e586d8..23b8c0e6 100644 --- a/bl-kernel/admin/themes/booty/css/99-lightmode.css +++ b/bl-kernel/admin/themes/booty/css/99-lightmode.css @@ -30,11 +30,6 @@ a.nav-link:hover, border-color: #dee2e6; } -.list-group-item { - background-color: inherit; - border: 0 none; -} - .list-group-item a { text-decoration: none; } diff --git a/bl-kernel/admin/themes/booty/index.php b/bl-kernel/admin/themes/booty/index.php index 537d1c5a..732df4ad 100644 --- a/bl-kernel/admin/themes/booty/index.php +++ b/bl-kernel/admin/themes/booty/index.php @@ -14,6 +14,7 @@ keys() as $key) { try { $category = new Category($key); echo '