From: <mo...@us...> - 2007-11-26 18:21:44
|
Update of /cvsroot/tikiwiki/tiki In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv23560 Modified Files: Tag: BRANCH-1-9 tiki-adminusers.php Log Message: [FIX] batch import users, better error checking to avoid extra error when error occurs Index: tiki-adminusers.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-adminusers.php,v retrieving revision 1.34.2.35 retrieving revision 1.34.2.36 diff -u -d -r1.34.2.35 -r1.34.2.36 --- tiki-adminusers.php 11 Aug 2007 13:50:38 -0000 1.34.2.35 +++ tiki-adminusers.php 26 Nov 2007 18:21:35 -0000 1.34.2.36 @@ -51,7 +51,7 @@ $data = fgetcsv($fhandle, 1000); } fclose ($fhandle); - if (!is_array($userrecs)) { + if (empty($userrecs) and !is_array($userrecs)) { $smarty->assign('msg', tra("No records were found. Check the file please!")); $smarty->display("error.tpl"); die; |