From: Jesse M. <jm...@us...> - 2003-10-31 06:57:04
|
Update of /cvsroot/gallery/gallery2/modules/migrate In directory sc8-pr-cvs1:/tmp/cvs-serv17341/modules/migrate Modified Files: ConfirmImport.inc Log Message: Fixed test for existing album in ConfirmImport.inc. Updated several phpdoc tags. Added commented-out test example for later. Index: ConfirmImport.inc =================================================================== RCS file: /cvsroot/gallery/gallery2/modules/migrate/ConfirmImport.inc,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- ConfirmImport.inc 24 Oct 2003 05:55:14 -0000 1.9 +++ ConfirmImport.inc 31 Oct 2003 06:56:58 -0000 1.10 @@ -409,12 +409,10 @@ GalleryFileSystemEntityHelper::fetchItemIdByPath($album['name']); } if ($ret->isError()) { - echo "<pre>err:\n"; - print_r($ret); - echo "</pre>"; - if (!$ret->getErrorCode() & MISSING_OBJECT) { + if (!$ret->getErrorCode() & ERROR_MISSING_OBJECT) { return array($ret->wrap(__FILE__, __LINE__), null); } + $existingAlbums[$album['name']] = FALSE; } else { $existingAlbums[$album['name']] = $existingAlbumId; } |