File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -560,6 +560,7 @@ public function isConfigured()
560560 && !empty ($ this ->properties [DB ::HOSTNAME ])
561561 && !empty ($ this ->properties [DB ::USERNAME ])
562562 && !empty ($ this ->properties [DB ::USER_TABLE ])
563+ && !empty ($ this ->properties [DB ::USER_UID_COLUMN ])
563564 && !empty ($ this ->properties [DB ::USER_PASSWORD_COLUMN ])
564565 && !empty ($ this ->properties [Opt::CRYPTO_CLASS ]);
565566 }
Original file line number Diff line number Diff line change @@ -83,14 +83,14 @@ private function loadQueries()
8383
8484 $ groupColumns
8585 = "$ gGID AS gid, " .
86- " $ gName AS name, " .
87- " $ gAdmin AS admin " ;
86+ ( empty ( $ gName ) ? " null " : $ gName) . " AS name, " .
87+ ( empty ( $ gAdmin ) ? " false " : $ gAdmin) . " AS admin " ;
8888 $ userColumns
8989 = "$ uUID AS uid, " .
90- " $ uName AS name, " .
91- " $ uEmail AS email, " .
92- " $ uHome AS home, " .
93- " $ uAvatar AS avatar " ;
90+ ( empty ( $ uName ) ? " null " : $ uName) . " AS name, " .
91+ ( empty ( $ uEmail ) ? " null " : $ uEmail) . " AS email, " .
92+ ( empty ( $ uHome ) ? " null " : $ uHome) . " AS home, " .
93+ ( empty ( $ uAvatar ) ? " false " : $ uAvatar) . " AS avatar " ;
9494
9595 $ this ->queries = [
9696 Query::BELONGS_TO_ADMIN =>
You can’t perform that action at this time.
0 commit comments