Skip to content

Commit 44f7845

Browse files
committed
Merge branch 'hotfix-0.3.1.18'
2 parents 1a83af6 + 7ed597b commit 44f7845

3 files changed

Lines changed: 8 additions & 1 deletion

File tree

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Change Log
22

3+
## v0.3.1.18
4+
5+
- Add check for logging being enabled but log file not existing yet
6+
37
## v0.3.1.17
48

59
- Fix occasional bug when end-of-file is reached on log file before requested number of lines is reached

userfrosting/initialize.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@
147147
'guest_theme' => 'default',
148148
'minify_css' => '0',
149149
'minify_js' => '0',
150-
'version' => '0.3.1.17',
150+
'version' => '0.3.1.18',
151151
'author' => 'Alex Weissman',
152152
'show_terms_on_register' => '1',
153153
'site_location' => 'The State of Indiana'

userfrosting/models/database/SiteSettings.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -407,6 +407,9 @@ static public function getLog($targetLines = null, $seekLen = 4096){
407407
if (!ini_get("log_errors")){
408408
$path = ini_get('error_log');
409409
$messages = ["Error logging appears to be disabled. Please check your php.ini file."];
410+
} else if (!file_exists(ini_get('error_log'))){
411+
$path = ini_get('error_log');
412+
$messages = ["Log file not found. If you haven't generated any errors, this is fine. If you were expecting to see errors here, please check your php.ini file."];
410413
} else {
411414
$path = ini_get('error_log');
412415
@$file = file($path);

0 commit comments

Comments
 (0)