From e2f198084fa59adcdb42980462dd799c37b1b2ab Mon Sep 17 00:00:00 2001 From: hecht Date: Thu, 20 Oct 2016 20:06:01 +0000 Subject: [PATCH] checkin changes performed on the cronjobs --- ag/include/char.inc.php | 10 +++++++--- ag/include/config.inc.php | 1 - ag/include/kampf/SSJ.php | 2 +- ag/include/sqlwrapper.inc.php | 2 -- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/ag/include/char.inc.php b/ag/include/char.inc.php index 86e65d0..8988fd4 100644 --- a/ag/include/char.inc.php +++ b/ag/include/char.inc.php @@ -183,10 +183,14 @@ function getCharBuffs($items) { * noavatar.gif zurueck!) * returns Url of Avatar-Picture * */ -function getPicture($char){ - $data = getUserMetaData($GLOBALS['user_array']['id']); +function getPicture($char) { + $hide = false; + if(isset($GLOBALS['user_array'])) { + $data = getUserMetaData($GLOBALS['user_array']['id']); + $hide = $data['hide_avatars'] == 1; + } // Sichergehen, dass Char geladen wurde - if($char['bild'] == null || $char['bild'] == '' || $data['hide_avatars'] == 1){ + if($char['bild'] == null || $char['bild'] == '' || $hide) { return 'design/bilder/avatare/noavart.gif'; } return $char['bild']; diff --git a/ag/include/config.inc.php b/ag/include/config.inc.php index 3caa90c..c97e5dd 100644 --- a/ag/include/config.inc.php +++ b/ag/include/config.inc.php @@ -68,4 +68,3 @@ $pic_g31 = 75; ///////////Bild Groesse $GLOBALS['user_array'] = $user_ida; -?> diff --git a/ag/include/kampf/SSJ.php b/ag/include/kampf/SSJ.php index 483915f..1331127 100644 --- a/ag/include/kampf/SSJ.php +++ b/ag/include/kampf/SSJ.php @@ -1,4 +1,4 @@ - \ No newline at end of file