Index: lib/wiki-plugins/wikiplugin_sql.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/lib/wiki-plugins/wikiplugin_sql.php,v
retrieving revision 1.8.2.4
diff -u -r1.8.2.4 wikiplugin_sql.php
--- lib/wiki-plugins/wikiplugin_sql.php	17 Mar 2006 22:14:42 -0000	1.8.2.4
+++ lib/wiki-plugins/wikiplugin_sql.php	19 Oct 2006 08:15:26 -0000
@@ -53,12 +53,18 @@
 		$parsedsn=substr($parsedsn,strlen($dbdriver)+3);
 		$dbuserid=strtok($parsedsn, ":");
 		$parsedsn=substr($parsedsn,strlen($dbuserid)+1);
-		$dbpassword=strtok($parsedsn, "@");
+		// awolff: strtok does not return emtpy strings -> a check is needed
+		if (substr($parsedsn,0,1) =='@') {
+			$dbpassword='';
+		} else {
+			$dbpassword=strtok($parsedsn, "@");
+		}
 		$parsedsn=substr($parsedsn,strlen($dbpassword)+1);
 		$dbhost=strtok($parsedsn, "/");
 		$parsedsn=substr($parsedsn,strlen($dbhost)+1);
 		$database = $parsedsn;
 
+
 		$dbsqlplugin = &ADONewConnection($dbdriver);
 		if (!$dbsqlplugin) {
 			$dberror = $dbsqlplugin->ErrorMsg();