X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fnickname_functions.php;h=9d501390db43c0b198cf7d23ba583d1b0d53ceab;hb=ef9dfab121f1d8929ce8cd4bf9aedaa968212b50;hp=aa7e715ead06b6f0c3544c77c6dd5e2372640e27;hpb=c544e11e6c117f1a1757bbc98b19e9675dc9b3cb;p=mailer.git

diff --git a/inc/libs/nickname_functions.php b/inc/libs/nickname_functions.php
index aa7e715ead..9d501390db 100644
--- a/inc/libs/nickname_functions.php
+++ b/inc/libs/nickname_functions.php
@@ -14,12 +14,10 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -51,7 +49,7 @@ function isNicknameOrUserid ($useridNick) {
 	if (isset($GLOBALS['nickname_active'][$useridNick])) {
 		// Use it directly
 		$ret = $GLOBALS['nickname_active'][$useridNick];
-	} else {
+	} elseif ((!empty($useridNick)) && ($useridNick != '0')) {
 		// Nickname or userid used?
 		$nick = getNickname($useridNick);
 
@@ -90,7 +88,7 @@ function getNickname ($userid) {
 				$GLOBALS['nicknames'][$userid] = $ret;
 			} // END - if
 		} else {
-			// Direct nickname found!
+			// Direct nickname found
 			$ret = $userid;
 
 			// Put it in cche