Skip to content

Commit 27ec2e2

Browse files
author
Till Brehm
committed
Merge branch 'client_delete_everything-does-not-delete-everything' into 'stable-3.1'
Check explicitly for session username, fixes #5389 See merge request ispconfig/ispconfig3!922
2 parents 8eb7e7c + e0c9b5c commit 27ec2e2

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

interface/lib/classes/db_mysql.inc.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -709,7 +709,7 @@ public function datalogSave($db_table, $action, $primary_field, $primary_id, $re
709709

710710
if($diff_num > 0) {
711711
$diffstr = serialize($diffrec_full);
712-
if(isset($_SESSION)) {
712+
if(!empty($_SESSION['s']['user']['username'])) {
713713
$username = $_SESSION['s']['user']['username'];
714714
} else {
715715
$username = 'admin';

server/lib/classes/db_mysql.inc.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -709,7 +709,7 @@ public function datalogSave($db_table, $action, $primary_field, $primary_id, $re
709709

710710
if($diff_num > 0) {
711711
$diffstr = serialize($diffrec_full);
712-
if(isset($_SESSION)) {
712+
if(!empty($_SESSION['s']['user']['username'])) {
713713
$username = $_SESSION['s']['user']['username'];
714714
} else {
715715
$username = 'admin';

0 commit comments

Comments
 (0)