From: <an...@us...> - 2007-04-14 09:18:22
|
Revision: 16306 http://svn.sourceforge.net/gallery/?rev=16306&view=rev Author: andy_st Date: 2007-04-14 02:18:19 -0700 (Sat, 14 Apr 2007) Log Message: ----------- Add requiredEntityType in all loadEntitiesById / deleteEntityById calls. Review 217. Bump core API requirement in all these plugins from 7,20 to 7,27. Modified Paths: -------------- trunk/gallery2/init.inc trunk/gallery2/install/steps/InstallOtherModulesStep.class trunk/gallery2/modules/albumselect/Callbacks.inc trunk/gallery2/modules/albumselect/module.inc trunk/gallery2/modules/cart/AddToCart.inc trunk/gallery2/modules/cart/ModifyCart.inc trunk/gallery2/modules/cart/classes/CartHelper.class trunk/gallery2/modules/cart/module.inc trunk/gallery2/modules/comment/Callbacks.inc trunk/gallery2/modules/comment/DeleteComment.inc trunk/gallery2/modules/comment/EditComment.inc trunk/gallery2/modules/comment/ShowAllComments.inc trunk/gallery2/modules/comment/ShowComments.inc trunk/gallery2/modules/comment/classes/GalleryCommentHelper.class trunk/gallery2/modules/comment/module.inc trunk/gallery2/modules/comment/test/phpunit/CommentTest.class trunk/gallery2/modules/comment/test/phpunit/EditCommentControllerTest.class trunk/gallery2/modules/core/test/phpunit/CodeAuditTest.class trunk/gallery2/modules/customfield/Callbacks.inc trunk/gallery2/modules/customfield/classes/CustomFieldHelper.class trunk/gallery2/modules/customfield/module.inc trunk/gallery2/modules/debug/ShowTree.inc trunk/gallery2/modules/debug/module.inc trunk/gallery2/modules/digibug/DigibugPrintPhotos.inc trunk/gallery2/modules/digibug/module.inc trunk/gallery2/modules/dynamicalbum/UpdatesAlbum.inc trunk/gallery2/modules/dynamicalbum/module.inc trunk/gallery2/modules/ecard/SendEcard.inc trunk/gallery2/modules/ecard/classes/EcardHelper.class trunk/gallery2/modules/ecard/module.inc trunk/gallery2/modules/exif/Callbacks.inc trunk/gallery2/modules/exif/classes/ExifExtractor.class trunk/gallery2/modules/exif/module.inc trunk/gallery2/modules/ffmpeg/AdminFfmpeg.inc trunk/gallery2/modules/ffmpeg/module.inc trunk/gallery2/modules/ffmpeg/test/phpunit/AdminFfmpegControllerTest.class trunk/gallery2/modules/flashvideo/module.inc trunk/gallery2/modules/fotokasten/PrintPhotos.inc trunk/gallery2/modules/fotokasten/module.inc trunk/gallery2/modules/getid3/Callbacks.inc trunk/gallery2/modules/getid3/classes/Getid3Extractor.class trunk/gallery2/modules/getid3/module.inc trunk/gallery2/modules/hidden/classes/HiddenHelper.class trunk/gallery2/modules/hidden/module.inc trunk/gallery2/modules/imageblock/classes/ImageBlockHelper.class trunk/gallery2/modules/imageblock/module.inc trunk/gallery2/modules/imageblock/test/phpunit/ImageBlockHandlerTest.class trunk/gallery2/modules/imageframe/Sample.inc trunk/gallery2/modules/imageframe/module.inc trunk/gallery2/modules/itemadd/module.inc trunk/gallery2/modules/itemadd/test/phpunit/ItemAddFromServerTest.class trunk/gallery2/modules/itemadd/test/phpunit/ItemAddFromWebTest.class trunk/gallery2/modules/keyalbum/KeywordAlbum.inc trunk/gallery2/modules/keyalbum/module.inc trunk/gallery2/modules/linkitem/ItemAddLinkItem.inc trunk/gallery2/modules/linkitem/classes/GalleryLinkItem.class trunk/gallery2/modules/linkitem/module.inc trunk/gallery2/modules/linkitem/test/phpunit/ItemAddLinkItemTest.class trunk/gallery2/modules/linkitem/test/phpunit/LinkItemTest.class trunk/gallery2/modules/members/MembersItems.inc trunk/gallery2/modules/members/MembersList.inc trunk/gallery2/modules/members/MembersProfile.inc trunk/gallery2/modules/members/classes/GalleryMembersHelper.class trunk/gallery2/modules/members/module.inc trunk/gallery2/modules/migrate/ChooseObjects.inc trunk/gallery2/modules/migrate/ConfirmImport.inc trunk/gallery2/modules/migrate/module.inc trunk/gallery2/modules/migrate/test/phpunit/ConfirmImportControllerTest.class trunk/gallery2/modules/mp3audio/module.inc trunk/gallery2/modules/multilang/module.inc trunk/gallery2/modules/multilang/test/phpunit/MultiLangItemEditPluginTest.class trunk/gallery2/modules/multiroot/ConfigureMultiroot.inc trunk/gallery2/modules/multiroot/module.inc trunk/gallery2/modules/newitems/classes/NewItemsHelper.class trunk/gallery2/modules/newitems/module.inc trunk/gallery2/modules/newitems/test/phpunit/NewItemsSiteAdminControllerTest.class trunk/gallery2/modules/nokiaupload/Configure.inc trunk/gallery2/modules/nokiaupload/classes/ImageUploadHelper.class trunk/gallery2/modules/nokiaupload/module.inc trunk/gallery2/modules/nokiaupload/test/phpunit/NokiaUploadConfigureControllerTest.class trunk/gallery2/modules/nokiaupload/test/phpunit/NokiaUploadNewDirectoryControllerTest.class trunk/gallery2/modules/nokiaupload/test/phpunit/NokiaUploadUploadControllerTest.class trunk/gallery2/modules/password/PasswordEntry.inc trunk/gallery2/modules/password/classes/PasswordHelper.class trunk/gallery2/modules/password/module.inc trunk/gallery2/modules/permalinks/module.inc trunk/gallery2/modules/permalinks/test/phpunit/PermalinksTest.class trunk/gallery2/modules/photoaccess/classes/PhotoAccessHelper.class trunk/gallery2/modules/photoaccess/module.inc trunk/gallery2/modules/picasa/ConfirmPicasaImport.inc trunk/gallery2/modules/picasa/ItemAddFromPicasa.inc trunk/gallery2/modules/picasa/SelectPicasaExportPath.inc trunk/gallery2/modules/picasa/module.inc trunk/gallery2/modules/picasa/test/phpunit/ConfirmPicasaImportControllerTest.class trunk/gallery2/modules/picasa/test/phpunit/ItemAddFromPicasaTest.class trunk/gallery2/modules/publishxp/DownloadRegistryFile.inc trunk/gallery2/modules/publishxp/NewAlbum.inc trunk/gallery2/modules/publishxp/Options.inc trunk/gallery2/modules/publishxp/SelectAlbum.inc trunk/gallery2/modules/publishxp/module.inc trunk/gallery2/modules/publishxp/test/phpunit/NewAlbumControllerTest.class trunk/gallery2/modules/publishxp/test/phpunit/UploadItemsControllerTest.class trunk/gallery2/modules/quotas/AdminCreateGroupQuota.inc trunk/gallery2/modules/quotas/AdminCreateUserQuota.inc trunk/gallery2/modules/quotas/AdminDeleteGroupQuota.inc trunk/gallery2/modules/quotas/AdminDeleteUserQuota.inc trunk/gallery2/modules/quotas/AdminEditGroupQuota.inc trunk/gallery2/modules/quotas/AdminEditUserQuota.inc trunk/gallery2/modules/quotas/module.inc trunk/gallery2/modules/quotas/test/phpunit/AdminCreateGroupQuotaControllerTest.class trunk/gallery2/modules/quotas/test/phpunit/AdminEditGroupQuotaControllerTest.class trunk/gallery2/modules/quotas/test/phpunit/DiskQuotasOptionTest.class trunk/gallery2/modules/quotas/test/phpunit/QuotasHelperTest.class trunk/gallery2/modules/quotas/test/phpunit/QuotasListenerTest.class trunk/gallery2/modules/randomhighlight/module.inc trunk/gallery2/modules/rating/Callbacks.inc trunk/gallery2/modules/rating/RatingAlbum.inc trunk/gallery2/modules/rating/classes/RatingHelper.class trunk/gallery2/modules/rating/module.inc trunk/gallery2/modules/rearrange/RearrangeItems.inc trunk/gallery2/modules/rearrange/module.inc trunk/gallery2/modules/register/AdminSelfRegistration.inc trunk/gallery2/modules/register/classes/GalleryPendingUserHelper.class trunk/gallery2/modules/register/module.inc trunk/gallery2/modules/register/test/phpunit/AdminSelfRegistrationControllerTest.class trunk/gallery2/modules/remote/GalleryRemote.inc trunk/gallery2/modules/remote/module.inc trunk/gallery2/modules/remote/test/phpunit/GalleryRemoteControllerTest.class trunk/gallery2/modules/replica/ItemCreateReplica.inc trunk/gallery2/modules/replica/ItemCreateReplicaSingle.inc trunk/gallery2/modules/replica/module.inc trunk/gallery2/modules/rewrite/DownloadItem.inc trunk/gallery2/modules/rewrite/RewriteModuleExtras.inc trunk/gallery2/modules/rewrite/classes/RewriteCheckConflictTask.class trunk/gallery2/modules/rewrite/classes/RewriteUrlGenerator.class trunk/gallery2/modules/rewrite/module.inc trunk/gallery2/modules/rss/EditFeed.inc trunk/gallery2/modules/rss/RssSiteAdmin.inc trunk/gallery2/modules/rss/classes/RssHelper.class trunk/gallery2/modules/rss/module.inc trunk/gallery2/modules/rss/test/phpunit/RssTest.class trunk/gallery2/modules/search/SearchScan.inc trunk/gallery2/modules/search/SearchShowAll.inc trunk/gallery2/modules/search/module.inc trunk/gallery2/modules/shutterfly/PrintPhotos.inc trunk/gallery2/modules/shutterfly/module.inc trunk/gallery2/modules/sizelimit/SizeLimitOption.inc trunk/gallery2/modules/sizelimit/classes/SizeLimitHelper.class trunk/gallery2/modules/sizelimit/module.inc trunk/gallery2/modules/slideshow/Slideshow.inc trunk/gallery2/modules/slideshow/module.inc trunk/gallery2/modules/slideshow/test/phpunit/SlideshowTest.class trunk/gallery2/modules/slideshowapplet/SlideshowApplet.inc trunk/gallery2/modules/slideshowapplet/module.inc trunk/gallery2/modules/thumbnail/CustomThumbnailOption.inc trunk/gallery2/modules/thumbnail/ThumbnailModuleExtras.inc trunk/gallery2/modules/thumbnail/ThumbnailSiteAdmin.inc trunk/gallery2/modules/thumbnail/classes/ThumbnailHelper.class trunk/gallery2/modules/thumbnail/classes/ThumbnailImage.class trunk/gallery2/modules/thumbnail/classes/ThumbnailToolkit.class trunk/gallery2/modules/thumbnail/module.inc trunk/gallery2/modules/thumbnail/test/phpunit/CustomThumbnailOptionTest.class trunk/gallery2/modules/thumbnail/test/phpunit/ThumbnailImageTest.class trunk/gallery2/modules/thumbnail/test/phpunit/ThumbnailToolkitTest.class trunk/gallery2/modules/useralbum/UserAlbum.inc trunk/gallery2/modules/useralbum/UserAlbumSiteAdmin.inc trunk/gallery2/modules/useralbum/module.inc trunk/gallery2/modules/useralbum/test/phpunit/UserAlbumControllerTest.class trunk/gallery2/modules/useralbum/test/phpunit/UserAlbumTest.class trunk/gallery2/modules/watermark/ConfirmDelete.inc trunk/gallery2/modules/watermark/DownloadItem.inc trunk/gallery2/modules/watermark/ItemEditWatermark.inc trunk/gallery2/modules/watermark/WatermarkOption.inc trunk/gallery2/modules/watermark/WatermarkSiteAdmin.inc trunk/gallery2/modules/watermark/classes/WatermarkHelper.class trunk/gallery2/modules/watermark/module.inc trunk/gallery2/modules/watermark/test/phpunit/ItemEditWatermarkPluginTest.class trunk/gallery2/modules/watermark/test/phpunit/UserWatermarkEditControllerTest.class trunk/gallery2/modules/watermark/test/phpunit/UserWatermarksControllerTest.class trunk/gallery2/modules/watermark/test/phpunit/WatermarkSiteAdminControllerTest.class trunk/gallery2/modules/webcam/ItemAddWebCam.inc trunk/gallery2/modules/webcam/module.inc trunk/gallery2/modules/webcam/test/phpunit/ItemAddWebCamTest.class trunk/gallery2/modules/webdav/DownloadDavMount.inc trunk/gallery2/modules/webdav/ItemAddWebDav.inc trunk/gallery2/modules/webdav/WebDav.inc trunk/gallery2/modules/webdav/classes/WebDavHelper.class trunk/gallery2/modules/webdav/module.inc trunk/gallery2/modules/webdav/test/phpunit/WebDavTest.class trunk/gallery2/modules/zipcart/classes/ZipCartPlugin.class trunk/gallery2/modules/zipcart/module.inc trunk/gallery2/themes/ajaxian/theme.inc trunk/gallery2/themes/classic/theme.inc trunk/gallery2/themes/hybrid/theme.inc trunk/gallery2/themes/slider/theme.inc trunk/gallery2/themes/tile/theme.inc trunk/gallery2/upgrade/index.php Modified: trunk/gallery2/init.inc =================================================================== --- trunk/gallery2/init.inc 2007-04-14 04:55:06 UTC (rev 16305) +++ trunk/gallery2/init.inc 2007-04-14 09:18:19 UTC (rev 16306) @@ -182,7 +182,7 @@ return $ret; } - list ($ret, $user) = GalleryCoreApi::loadEntitiesById($userId); + list ($ret, $user) = GalleryCoreApi::loadEntitiesById($userId, 'GalleryUser'); if ($ret) { return $ret; } Modified: trunk/gallery2/install/steps/InstallOtherModulesStep.class =================================================================== --- trunk/gallery2/install/steps/InstallOtherModulesStep.class 2007-04-14 04:55:06 UTC (rev 16305) +++ trunk/gallery2/install/steps/InstallOtherModulesStep.class 2007-04-14 09:18:19 UTC (rev 16306) @@ -267,7 +267,8 @@ return GalleryCoreApi::error(ERROR_MISSING_VALUE); } $adminUserInfo = array_keys($adminUserInfo); - list ($ret, $adminUser) = GalleryCoreApi::loadEntitiesById($adminUserInfo[0]); + list ($ret, $adminUser) = + GalleryCoreApi::loadEntitiesById($adminUserInfo[0], 'GalleryUser'); if ($ret) { return $ret; } Modified: trunk/gallery2/modules/albumselect/Callbacks.inc =================================================================== --- trunk/gallery2/modules/albumselect/Callbacks.inc 2007-04-14 04:55:06 UTC (rev 16305) +++ trunk/gallery2/modules/albumselect/Callbacks.inc 2007-04-14 09:18:19 UTC (rev 16306) @@ -63,7 +63,8 @@ if (isset($callbackParams['truncateTitles'])) { GalleryCoreApi::requireOnce('lib/smarty_plugins/modifier.entitytruncate.php'); } - list ($ret, $rootAlbum) = GalleryCoreApi::loadEntitiesById($rootAlbumId); + list ($ret, $rootAlbum) = + GalleryCoreApi::loadEntitiesById($rootAlbumId, 'GalleryItem'); if ($ret) { return $ret; } @@ -92,7 +93,7 @@ } list ($ret, $items) = GalleryCoreApi::loadEntitiesById( - GalleryUtilities::arrayKeysRecursive($tree)); + GalleryUtilities::arrayKeysRecursive($tree), 'GalleryAlbumItem'); if ($ret) { return $ret; } @@ -225,7 +226,8 @@ return $ret; } if (!empty($subAlbumIds)) { - list ($ret, $subAlbums) = GalleryCoreApi::loadEntitiesById($subAlbumIds); + list ($ret, $subAlbums) = + GalleryCoreApi::loadEntitiesById($subAlbumIds, 'GalleryAlbumItem'); if ($ret) { return $ret; } Modified: trunk/gallery2/modules/albumselect/module.inc =================================================================== --- trunk/gallery2/modules/albumselect/module.inc 2007-04-14 04:55:06 UTC (rev 16305) +++ trunk/gallery2/modules/albumselect/module.inc 2007-04-14 09:18:19 UTC (rev 16306) @@ -34,11 +34,11 @@ $this->setName($gallery->i18n('Album Select')); $this->setDescription( $gallery->i18n('Jump directly to any album using a select box or tree view')); - $this->setVersion('1.0.7'); + $this->setVersion('1.0.8'); $this->_templateVersion = 1; $this->setGroup('blocks', $gallery->i18n('Blocks')); $this->setCallbacks('getSiteAdminViews|registerEventListeners'); - $this->setRequiredCoreApi(array(7, 20)); + $this->setRequiredCoreApi(array(7, 27)); $this->setRequiredModuleApi(array(3, 6)); } Modified: trunk/gallery2/modules/cart/AddToCart.inc =================================================================== --- trunk/gallery2/modules/cart/AddToCart.inc 2007-04-14 04:55:06 UTC (rev 16305) +++ trunk/gallery2/modules/cart/AddToCart.inc 2007-04-14 09:18:19 UTC (rev 16306) @@ -37,7 +37,7 @@ $itemId = GalleryUtilities::getRequestVariables('itemId'); - list ($ret, $item) = GalleryCoreApi::loadEntitiesById($itemId); + list ($ret, $item) = GalleryCoreApi::loadEntitiesById($itemId, 'GalleryItem'); if ($ret) { return array($ret, null); } Modified: trunk/gallery2/modules/cart/ModifyCart.inc =================================================================== --- trunk/gallery2/modules/cart/ModifyCart.inc 2007-04-14 04:55:06 UTC (rev 16305) +++ trunk/gallery2/modules/cart/ModifyCart.inc 2007-04-14 09:18:19 UTC (rev 16306) @@ -95,7 +95,8 @@ } /* Pass in only the types the plugin supports */ - list ($ret, $itemList) = GalleryCoreApi::loadEntitiesById(array_keys($cartItemIds)); + list ($ret, $itemList) = + GalleryCoreApi::loadEntitiesById(array_keys($cartItemIds), 'GalleryItem'); if ($ret) { return array($ret, null); } Modified: trunk/gallery2/modules/cart/classes/CartHelper.class =================================================================== --- trunk/gallery2/modules/cart/classes/CartHelper.class 2007-04-14 04:55:06 UTC (rev 16305) +++ trunk/gallery2/modules/cart/classes/CartHelper.class 2007-04-14 09:18:19 UTC (rev 16306) @@ -130,7 +130,7 @@ $changed = false; $items = array(); foreach ($idList as $itemId) { - list ($ret, $item) = GalleryCoreApi::loadEntitiesById($itemId); + list ($ret, $item) = GalleryCoreApi::loadEntitiesById($itemId, 'GalleryItem'); if ($ret) { if ($ret->getErrorCode() & ERROR_MISSING_OBJECT) { /* Item deleted from the gallery; remove it from the cart */ Modified: trunk/gallery2/modules/cart/module.inc =================================================================== --- trunk/gallery2/modules/cart/module.inc 2007-04-14 04:55:06 UTC (rev 16305) +++ trunk/gallery2/modules/cart/module.inc 2007-04-14 09:18:19 UTC (rev 16306) @@ -33,11 +33,11 @@ $this->setId('cart'); $this->setName($gallery->i18n('Cart')); $this->setDescription($gallery->i18n('Shopping Cart Module')); - $this->setVersion('1.0.7'); /* Update upgrade() function below too */ + $this->setVersion('1.0.8'); /* Update upgrade() function below too */ $this->_templateVersion = 1; $this->setGroup('commerce', $gallery->i18n('Commerce')); $this->setCallbacks('getItemLinks'); - $this->setRequiredCoreApi(array(7, 20)); + $this->setRequiredCoreApi(array(7, 27)); $this->setRequiredModuleApi(array(3, 6)); } @@ -126,6 +126,7 @@ case '1.0.5': case '1.0.6': /* .mo file migration */ + case '1.0.7': case 'end of upgrade path': break; Modified: trunk/gallery2/modules/comment/Callbacks.inc =================================================================== --- trunk/gallery2/modules/comment/Callbacks.inc 2007-04-14 04:55:06 UTC (rev 16305) +++ trunk/gallery2/modules/comment/Callbacks.inc 2007-04-14 09:18:19 UTC (rev 16306) @@ -30,7 +30,7 @@ switch ($callback) { case 'LoadComments': $itemId = $params['itemId']; - list ($ret, $item) = GalleryCoreApi::loadEntitiesById($itemId); + list ($ret, $item) = GalleryCoreApi::loadEntitiesById($itemId, 'GalleryItem'); if ($ret) { return $ret; } @@ -73,7 +73,7 @@ /* Load all the commenters */ if (sizeof($commenters) > 0) { list ($ret, $commentersList) = - GalleryCoreApi::loadEntitiesById(array_keys($commenters)); + GalleryCoreApi::loadEntitiesById(array_keys($commenters), 'GalleryUser'); if ($ret) { return $ret; } @@ -107,7 +107,7 @@ case 'AddComment': /* Load our item */ - list ($ret, $item) = GalleryCoreApi::loadEntitiesById($params['itemId']); + list ($ret, $item) = GalleryCoreApi::loadEntitiesById($params['itemId'], 'GalleryItem'); if ($ret) { return $ret; } Modified: trunk/gallery2/modules/comment/DeleteComment.inc =================================================================== --- trunk/gallery2/modules/comment/DeleteComment.inc 2007-04-14 04:55:06 UTC (rev 16305) +++ trunk/gallery2/modules/comment/DeleteComment.inc 2007-04-14 09:18:19 UTC (rev 16306) @@ -47,21 +47,17 @@ $error = array(); if (isset($form['action']['delete'])) { /* Delete the comment */ - list ($ret, $comment) = GalleryCoreApi::loadEntitiesById($commentId); + list ($ret, $comment) = GalleryCoreApi::loadEntitiesById($commentId, 'GalleryComment'); if ($ret) { return array($ret, null); } - - if (!GalleryUtilities::isA($comment, 'GalleryComment')) { - return array(GalleryCoreApi::error(ERROR_BAD_PARAMETER), null); - } /* Make sure that the comment<->parent relationship is right */ if ($comment->getParentId() != $itemId) { return array(GalleryCoreApi::error(ERROR_BAD_PARAMETER), null); } - $ret = GalleryCoreApi::deleteEntityById($comment->getId()); + $ret = GalleryCoreApi::deleteEntityById($comment->getId(), 'GalleryComment'); if ($ret) { return array($ret, null); } @@ -119,17 +115,14 @@ } /* Load the specific comment */ - list ($ret, $comment) = GalleryCoreApi::loadEntitiesById($commentId); + list ($ret, $comment) = GalleryCoreApi::loadEntitiesById($commentId, 'GalleryComment'); if ($ret) { return array($ret, null); } - if (!GalleryUtilities::isA($comment, 'GalleryComment')) { - return array(GalleryCoreApi::error(ERROR_BAD_PARAMETER), null); - } /* Associate the commenter's info */ $commenterId = $comment->getCommenterId(); - list ($ret, $commenter) = GalleryCoreApi::loadEntitiesById($commenterId); + list ($ret, $commenter) = GalleryCoreApi::loadEntitiesById($commenterId, 'GalleryUser'); if ($ret) { return array($ret, null); } Modified: trunk/gallery2/modules/comment/EditComment.inc =================================================================== --- trunk/gallery2/modules/comment/EditComment.inc 2007-04-14 04:55:06 UTC (rev 16305) +++ trunk/gallery2/modules/comment/EditComment.inc 2007-04-14 09:18:19 UTC (rev 16306) @@ -47,7 +47,7 @@ $error = array(); if (isset($form['action']['save'])) { /* Edit the comment */ - list ($ret, $comment) = GalleryCoreApi::loadEntitiesById($commentId); + list ($ret, $comment) = GalleryCoreApi::loadEntitiesById($commentId, 'GalleryComment'); if ($ret) { return array($ret, null); } @@ -201,7 +201,7 @@ $commentId = (int) GalleryUtilities::getRequestVariables('commentId'); /* Load the specific comment */ - list ($ret, $comment) = GalleryCoreApi::loadEntitiesById($commentId); + list ($ret, $comment) = GalleryCoreApi::loadEntitiesById($commentId, 'GalleryComment'); if ($ret) { return array($ret, null); } @@ -213,7 +213,7 @@ /* Associate the commenter's info */ $commenterId = $comment->getCommenterId(); - list ($ret, $commenter) = GalleryCoreApi::loadEntitiesById($commenterId); + list ($ret, $commenter) = GalleryCoreApi::loadEntitiesById($commenterId, 'GalleryUser'); if ($ret) { return array($ret, null); } Modified: trunk/gallery2/modules/comment/ShowAllComments.inc =================================================================== --- trunk/gallery2/modules/comment/ShowAllComments.inc 2007-04-14 04:55:06 UTC (rev 16305) +++ trunk/gallery2/modules/comment/ShowAllComments.inc 2007-04-14 09:18:19 UTC (rev 16306) @@ -70,7 +70,7 @@ if (!empty($commenters)) { list ($ret, $commentersList) = - GalleryCoreApi::loadEntitiesById(array_keys($commenters)); + GalleryCoreApi::loadEntitiesById(array_keys($commenters), 'GalleryUser'); if ($ret) { return array($ret, null); } @@ -86,7 +86,7 @@ if ($ret) { return array($ret, null); } - list ($ret, $itemList) = GalleryCoreApi::loadEntitiesById($itemIds); + list ($ret, $itemList) = GalleryCoreApi::loadEntitiesById($itemIds, 'GalleryItem'); if ($ret) { return array($ret, null); } Modified: trunk/gallery2/modules/comment/ShowComments.inc =================================================================== --- trunk/gallery2/modules/comment/ShowComments.inc 2007-04-14 04:55:06 UTC (rev 16305) +++ trunk/gallery2/modules/comment/ShowComments.inc 2007-04-14 09:18:19 UTC (rev 16306) @@ -56,7 +56,7 @@ /* Load all the commenters */ if (sizeof($commenters) > 0) { list ($ret, $commentersList) = - GalleryCoreApi::loadEntitiesById(array_keys($commenters)); + GalleryCoreApi::loadEntitiesById(array_keys($commenters), 'GalleryUser'); if ($ret) { return array($ret, null); } Modified: trunk/gallery2/modules/comment/classes/GalleryCommentHelper.class =================================================================== --- trunk/gallery2/modules/comment/classes/GalleryCommentHelper.class 2007-04-14 04:55:06 UTC (rev 16305) +++ trunk/gallery2/modules/comment/classes/GalleryCommentHelper.class 2007-04-14 09:18:19 UTC (rev 16306) @@ -83,7 +83,7 @@ /* Load all the comments at once */ $comments = array(); if (!empty($allIds)) { - list ($ret, $comments) = GalleryCoreApi::loadEntitiesById($allIds); + list ($ret, $comments) = GalleryCoreApi::loadEntitiesById($allIds, 'GalleryComment'); if ($ret) { return array($ret, null); } @@ -182,7 +182,7 @@ /* Load all the comments at once */ $comments = array(); if (!empty($allIds)) { - list ($ret, $comments) = GalleryCoreApi::loadEntitiesById($allIds); + list ($ret, $comments) = GalleryCoreApi::loadEntitiesById($allIds, 'GalleryComment'); if ($ret) { return array($ret, null, null); } @@ -366,7 +366,7 @@ } while ($result = $searchResults->nextResult()) { - $ret = GalleryCoreApi::deleteEntityById((int)$result[0]); + $ret = GalleryCoreApi::deleteEntityById((int)$result[0], 'GalleryComment'); if ($ret) { return array($ret, null); } Modified: trunk/gallery2/modules/comment/module.inc =================================================================== --- trunk/gallery2/modules/comment/module.inc 2007-04-14 04:55:06 UTC (rev 16305) +++ trunk/gallery2/modules/comment/module.inc 2007-04-14 09:18:19 UTC (rev 16306) @@ -35,12 +35,12 @@ $this->setId('comment'); $this->setName($gallery->i18n('Comments')); $this->setDescription($gallery->i18n('User commenting system')); - $this->setVersion('1.1.4'); /* Update upgrade() function below too */ + $this->setVersion('1.1.5'); /* Update upgrade() function below too */ $this->_templateVersion = 1; $this->setGroup('data', $gallery->i18n('Extra Data')); $this->setCallbacks('registerEventListeners|getItemLinks|getItemSummaries|' . 'getSiteAdminViews|getItemAdminViews'); - $this->setRequiredCoreApi(array(7, 20)); + $this->setRequiredCoreApi(array(7, 27)); $this->setRequiredModuleApi(array(3, 6)); } @@ -150,6 +150,7 @@ case '1.1.2': case '1.1.3': /* .mo file migration */ + case '1.1.4': case 'end of upgrade path': /* Modified: trunk/gallery2/modules/comment/test/phpunit/CommentTest.class =================================================================== --- trunk/gallery2/modules/comment/test/phpunit/CommentTest.class 2007-04-14 04:55:06 UTC (rev 16305) +++ trunk/gallery2/modules/comment/test/phpunit/CommentTest.class 2007-04-14 09:18:19 UTC (rev 16306) @@ -232,7 +232,7 @@ } /* Delete it */ - $ret = GalleryCoreApi::deleteEntityById($comment->getId()); + $ret = GalleryCoreApi::deleteEntityById($comment->getId(), 'GalleryComment'); if ($ret) { return $ret; } @@ -294,7 +294,7 @@ $this->_registerTestEventListener('GalleryEntity::delete', $listener); /* Delete the user (execute the test) */ - $ret = GalleryCoreApi::deleteEntityById($user->getId()); + $ret = GalleryCoreApi::deleteEntityById($user->getId(), 'GalleryUser'); if ($ret) { return $ret; } Modified: trunk/gallery2/modules/comment/test/phpunit/EditCommentControllerTest.class =================================================================== --- trunk/gallery2/modules/comment/test/phpunit/EditCommentControllerTest.class 2007-04-14 04:55:06 UTC (rev 16305) +++ trunk/gallery2/modules/comment/test/phpunit/EditCommentControllerTest.class 2007-04-14 09:18:19 UTC (rev 16306) @@ -74,7 +74,7 @@ } list ($ret, $this->_anonymousUser) = - GalleryCoreApi::loadEntitiesById($this->_anonymousUserId); + GalleryCoreApi::loadEntitiesById($this->_anonymousUserId, 'GalleryUser'); if ($ret) { return $ret; } Modified: trunk/gallery2/modules/core/test/phpunit/CodeAuditTest.class =================================================================== --- trunk/gallery2/modules/core/test/phpunit/CodeAuditTest.class 2007-04-14 04:55:06 UTC (rev 16305) +++ trunk/gallery2/modules/core/test/phpunit/CodeAuditTest.class 2007-04-14 09:18:19 UTC (rev 16306) @@ -173,9 +173,7 @@ $fileName = substr($fileName, strlen($this->_baseDir) + 1); $lines = split("(\r\n|\n)", $buffer); $checkSuperglobals = !preg_match('{/test/phpunit|^install/|^upgrade/}', $fileName); - /** @todo Extend the loadEntitiesById test to all G2 code */ - $checkEntityType = strpos($fileName, 'modules/core/') !== false - && strpos($fileName, 'modules/core/test/phpunit/EntityTest.class') === false; + $checkEntityType = $fileName != 'modules/core/test/phpunit/EntityTest.class'; $currentFunction = null; $currentClass = null; $longLineTable = $returnTable = array(); Modified: trunk/gallery2/modules/customfield/Callbacks.inc =================================================================== --- trunk/gallery2/modules/customfield/Callbacks.inc 2007-04-14 04:55:06 UTC (rev 16305) +++ trunk/gallery2/modules/customfield/Callbacks.inc 2007-04-14 09:18:19 UTC (rev 16306) @@ -31,7 +31,7 @@ switch ($callback) { case 'LoadCustomFields': - list ($ret, $item) = GalleryCoreApi::loadEntitiesById($params['itemId']); + list ($ret, $item) = GalleryCoreApi::loadEntitiesById($params['itemId'], 'GalleryItem'); if ($ret) { return $ret; } Modified: trunk/gallery2/modules/customfield/classes/CustomFieldHelper.class =================================================================== --- trunk/gallery2/modules/customfield/classes/CustomFieldHelper.class 2007-04-14 04:55:06 UTC (rev 16305) +++ trunk/gallery2/modules/customfield/classes/CustomFieldHelper.class 2007-04-14 09:18:19 UTC (rev 16306) @@ -490,7 +490,7 @@ * @see CustomFieldInterface_1_0::setCustomFieldValues */ function setCustomFieldValues($itemId, $data) { - list ($ret, $item) = GalleryCoreApi::loadEntitiesById($itemId); + list ($ret, $item) = GalleryCoreApi::loadEntitiesById($itemId, 'GalleryItem'); if ($ret) { return $ret; } Modified: trunk/gallery2/modules/customfield/module.inc =================================================================== --- trunk/gallery2/modules/customfield/module.inc 2007-04-14 04:55:06 UTC (rev 16305) +++ trunk/gallery2/modules/customfield/module.inc 2007-04-14 09:18:19 UTC (rev 16306) @@ -35,11 +35,11 @@ $this->setId('customfield'); $this->setName($gallery->i18n('Custom Fields')); $this->setDescription($gallery->i18n('Create custom data fields for Gallery items')); - $this->setVersion('1.0.9'); + $this->setVersion('1.0.10'); $this->_templateVersion = 1; $this->setGroup('data', $gallery->i18n('Extra Data')); $this->setCallbacks('registerEventListeners|getSiteAdminViews|getItemSummaries'); - $this->setRequiredCoreApi(array(7, 20)); + $this->setRequiredCoreApi(array(7, 27)); $this->setRequiredModuleApi(array(3, 6)); } Modified: trunk/gallery2/modules/debug/ShowTree.inc =================================================================== --- trunk/gallery2/modules/debug/ShowTree.inc 2007-04-14 04:55:06 UTC (rev 16305) +++ trunk/gallery2/modules/debug/ShowTree.inc 2007-04-14 09:18:19 UTC (rev 16306) @@ -46,7 +46,7 @@ } $entityId = $entity->getId(); } else { - list ($ret, $entity) = GalleryCoreApi::loadEntitiesById($entityId); + list ($ret, $entity) = GalleryCoreApi::loadEntitiesById($entityId, 'GalleryEntity'); if ($ret) { return array($ret, null); } @@ -80,8 +80,8 @@ if (!empty($parentIds) || !empty($childIds)) { /* Load everything at once */ - list ($ret, $entityObjects) = - GalleryCoreApi::loadEntitiesById(array_merge($parentIds, $childIds)); + list ($ret, $entityObjects) = GalleryCoreApi::loadEntitiesById( + array_merge($parentIds, $childIds), 'GalleryEntity'); if ($ret) { return array($ret, null); } Modified: trunk/gallery2/modules/debug/module.inc =================================================================== --- trunk/gallery2/modules/debug/module.inc 2007-04-14 04:55:06 UTC (rev 16305) +++ trunk/gallery2/modules/debug/module.inc 2007-04-14 09:18:19 UTC (rev 16306) @@ -35,11 +35,11 @@ $this->setId('debug'); $this->setName($gallery->i18n('Debugging')); $this->setDescription($gallery->i18n('Debugging and Developer Tools')); - $this->setVersion('1.0.6'); + $this->setVersion('1.0.7'); $this->_templateVersion = 1; $this->setGroup('gallery', $gallery->i18n('Gallery')); $this->setCallbacks('getItemLinks'); - $this->setRequiredCoreApi(array(7, 20)); + $this->setRequiredCoreApi(array(7, 27)); $this->setRequiredModuleApi(array(3, 6)); } Modified: trunk/gallery2/modules/digibug/DigibugPrintPhotos.inc =================================================================== --- trunk/gallery2/modules/digibug/DigibugPrintPhotos.inc 2007-04-14 04:55:06 UTC (rev 16305) +++ trunk/gallery2/modules/digibug/DigibugPrintPhotos.inc 2007-04-14 09:18:19 UTC (rev 16306) @@ -62,7 +62,7 @@ /* Load the necessary item data */ $itemIds = array_keys($cartItemIds); - list ($ret, $items) = GalleryCoreApi::loadEntitiesById($itemIds); + list ($ret, $items) = GalleryCoreApi::loadEntitiesById($itemIds, 'GalleryPhotoItem'); if ($ret) { return $ret; } Modified: trunk/gallery2/modules/digibug/module.inc =================================================================== --- trunk/gallery2/modules/digibug/module.inc 2007-04-14 04:55:06 UTC (rev 16305) +++ trunk/gallery2/modules/digibug/module.inc 2007-04-14 09:18:19 UTC (rev 16306) @@ -33,11 +33,11 @@ $this->setId('digibug'); $this->setName($gallery->i18n('Digibug')); $this->setDescription($gallery->i18n('Digibug Photo Printing Module')); - $this->setVersion('1.0.1'); /* Update upgrade() too */ + $this->setVersion('1.0.2'); /* Update upgrade() too */ $this->_templateVersion = 1; $this->setGroup('commerce', $gallery->i18n('Commerce')); $this->setCallbacks('getSiteAdminViews|getItemLinks'); - $this->setRequiredCoreApi(array(7, 20)); + $this->setRequiredCoreApi(array(7, 27)); $this->setRequiredModuleApi(array(3, 6)); } @@ -78,6 +78,7 @@ case '0.9.1': case '1.0.0': /* .mo file migration */ + case '1.0.1': case 'end of upgrade path': break; Modified: trunk/gallery2/modules/dynamicalbum/UpdatesAlbum.inc =================================================================== --- trunk/gallery2/modules/dynamicalbum/UpdatesAlbum.inc 2007-04-14 04:55:06 UTC (rev 16305) +++ trunk/gallery2/modules/dynamicalbum/UpdatesAlbum.inc 2007-04-14 09:18:19 UTC (rev 16306) @@ -73,14 +73,10 @@ $itemId = GalleryUtilities::getRequestVariables('itemId'); if (!empty($itemId)) { /* Viewing an item in this dynamic album */ - list ($ret, $viewItem) = GalleryCoreApi::loadEntitiesById($itemId); + list ($ret, $viewItem) = GalleryCoreApi::loadEntitiesById($itemId, 'GalleryItem'); if ($ret) { return array($ret, null, null, null); } - if (!GalleryUtilities::isA($viewItem, 'GalleryItem')) { - /* Invalid itemId given, return MISSING_OBJECT to get standard error page */ - return array(GalleryCoreApi::error(ERROR_MISSING_OBJECT), null, null, null); - } /* Provide parent, parent URL and get-children function to Theme API */ $item->urlParams = array('view' => $this->_view, 'highlightId' => $itemId); Modified: trunk/gallery2/modules/dynamicalbum/module.inc =================================================================== --- trunk/gallery2/modules/dynamicalbum/module.inc 2007-04-14 04:55:06 UTC (rev 16305) +++ trunk/gallery2/modules/dynamicalbum/module.inc 2007-04-14 09:18:19 UTC (rev 16306) @@ -33,11 +33,11 @@ $this->setName($gallery->i18n('Dynamic Albums')); $this->setDescription( $gallery->i18n('Dynamic albums for newest, most viewed or random items')); - $this->setVersion('1.0.1'); + $this->setVersion('1.0.2'); $this->_templateVersion = 1; $this->setGroup('display', $gallery->i18n('Display')); $this->setCallbacks('getSiteAdminViews|getItemLinks'); - $this->setRequiredCoreApi(array(7, 20)); + $this->setRequiredCoreApi(array(7, 27)); $this->setRequiredModuleApi(array(3, 6)); } Modified: trunk/gallery2/modules/ecard/SendEcard.inc =================================================================== --- trunk/gallery2/modules/ecard/SendEcard.inc 2007-04-14 04:55:06 UTC (rev 16305) +++ trunk/gallery2/modules/ecard/SendEcard.inc 2007-04-14 09:18:19 UTC (rev 16306) @@ -113,7 +113,7 @@ } /* Get current item */ - list ($ret, $item) = GalleryCoreApi::loadEntitiesById($itemId); + list ($ret, $item) = GalleryCoreApi::loadEntitiesById($itemId, 'GalleryItem'); if ($ret) { return array($ret, null); } Modified: trunk/gallery2/modules/ecard/classes/EcardHelper.class =================================================================== --- trunk/gallery2/modules/ecard/classes/EcardHelper.class 2007-04-14 04:55:06 UTC (rev 16305) +++ trunk/gallery2/modules/ecard/classes/EcardHelper.class 2007-04-14 09:18:19 UTC (rev 16306) @@ -68,7 +68,7 @@ } } if (isset($permissions['core.viewSource'])) { - list ($ret, $item) = GalleryCoreApi::loadEntitiesById($itemId); + list ($ret, $item) = GalleryCoreApi::loadEntitiesById($itemId, 'GalleryItem'); if ($ret) { return array($ret, null); } Modified: trunk/gallery2/modules/ecard/module.inc =================================================================== --- trunk/gallery2/modules/ecard/module.inc 2007-04-14 04:55:06 UTC (rev 16305) +++ trunk/gallery2/modules/ecard/module.inc 2007-04-14 09:18:19 UTC (rev 16306) @@ -34,11 +34,11 @@ $this->setId('ecard'); $this->setName($gallery->i18n('eCard')); $this->setDescription($gallery->i18n('Send photos as eCards')); - $this->setVersion('1.0.1'); /* Update upgrade() too */ + $this->setVersion('1.0.2'); /* Update upgrade() too */ $this->_templateVersion = 1; $this->setGroup('commerce', $gallery->i18n('Commerce')); $this->setCallbacks('getItemLinks|getSiteAdminViews'); - $this->setRequiredCoreApi(array(7, 20)); + $this->setRequiredCoreApi(array(7, 27)); $this->setRequiredModuleApi(array(3, 6)); } @@ -108,6 +108,7 @@ case '0.9.1': case '1.0.0': /* .mo file migration */ + case '1.0.1': case 'end of upgrade path': break; Modified: trunk/gallery2/modules/exif/Callbacks.inc =================================================================== --- trunk/gallery2/modules/exif/Callbacks.inc 2007-04-14 04:55:06 UTC (rev 16305) +++ trunk/gallery2/modules/exif/Callbacks.inc 2007-04-14 09:18:19 UTC (rev 16306) @@ -33,7 +33,7 @@ case 'LoadExifInfo': GalleryCoreApi::requireOnce('modules/exif/classes/ExifHelper.class'); - list ($ret, $item) = GalleryCoreApi::loadEntitiesById($params['itemId']); + list ($ret, $item) = GalleryCoreApi::loadEntitiesById($params['itemId'], 'GalleryItem'); if ($ret) { return $ret; } Modified: trunk/gallery2/modules/exif/classes/ExifExtractor.class =================================================================== --- trunk/gallery2/modules/exif/classes/ExifExtractor.class 2007-04-14 04:55:06 UTC (rev 16305) +++ trunk/gallery2/modules/exif/classes/ExifExtractor.class 2007-04-14 09:18:19 UTC (rev 16306) @@ -46,7 +46,7 @@ $data = array(); foreach ($itemIds as $itemId) { - list ($ret, $item) = GalleryCoreApi::loadEntitiesById($itemId); + list ($ret, $item) = GalleryCoreApi::loadEntitiesById($itemId, 'GalleryItem'); if ($ret) { return array($ret, null); } Modified: trunk/gallery2/modules/exif/module.inc =================================================================== --- trunk/gallery2/modules/exif/module.inc 2007-04-14 04:55:06 UTC (rev 16305) +++ trunk/gallery2/modules/exif/module.inc 2007-04-14 09:18:19 UTC (rev 16306) @@ -37,11 +37,11 @@ $this->setId('exif'); $this->setName($gallery->i18n('EXIF/IPTC')); $this->setDescription($gallery->i18n('Extract EXIF/IPTC data from JPEG photos')); - $this->setVersion('1.2.1'); /* Update upgrade() function below too */ + $this->setVersion('1.2.2'); /* Update upgrade() function below too */ $this->_templateVersion = 1; $this->setGroup('data', $gallery->i18n('Extra Data')); $this->setCallbacks('getSiteAdminViews'); - $this->setRequiredCoreApi(array(7, 20)); + $this->setRequiredCoreApi(array(7, 27)); $this->setRequiredModuleApi(array(3, 6)); } @@ -136,6 +136,7 @@ case '1.1.0.1': case '1.2.0': /* .mo file migration */ + case '1.2.1': case 'end of upgrade path': /* Modified: trunk/gallery2/modules/ffmpeg/AdminFfmpeg.inc =================================================================== --- trunk/gallery2/modules/ffmpeg/AdminFfmpeg.inc 2007-04-14 04:55:06 UTC (rev 16305) +++ trunk/gallery2/modules/ffmpeg/AdminFfmpeg.inc 2007-04-14 09:18:19 UTC (rev 16306) @@ -196,7 +196,8 @@ if ($ret) { return $ret; } - list ($ret, $thumbnails) = GalleryCoreApi::loadEntitiesById($idSet); + list ($ret, $thumbnails) = + GalleryCoreApi::loadEntitiesById($idSet, 'GalleryDerivative'); if ($ret) { GalleryCoreApi::releaseLocks($lockId); return $ret; Modified: trunk/gallery2/modules/ffmpeg/module.inc =================================================================== --- trunk/gallery2/modules/ffmpeg/module.inc 2007-04-14 04:55:06 UTC (rev 16305) +++ trunk/gallery2/modules/ffmpeg/module.inc 2007-04-14 09:18:19 UTC (rev 16306) @@ -35,11 +35,11 @@ $this->setId('ffmpeg'); $this->setName($gallery->i18n('Ffmpeg')); $this->setDescription($gallery->i18n('A toolkit for processing movies')); - $this->setVersion('1.0.10'); + $this->setVersion('1.0.11'); $this->_templateVersion = 1; $this->setGroup('toolkits', $gallery->i18n('Graphics Toolkits')); $this->setCallbacks('getSiteAdminViews'); - $this->setRequiredCoreApi(array(7, 20)); + $this->setRequiredCoreApi(array(7, 27)); $this->setRequiredModuleApi(array(3, 6)); } Modified: trunk/gallery2/modules/ffmpeg/test/phpunit/AdminFfmpegControllerTest.class =================================================================== --- trunk/gallery2/modules/ffmpeg/test/phpunit/AdminFfmpegControllerTest.class 2007-04-14 04:55:06 UTC (rev 16305) +++ trunk/gallery2/modules/ffmpeg/test/phpunit/AdminFfmpegControllerTest.class 2007-04-14 09:18:19 UTC (rev 16306) @@ -291,7 +291,7 @@ return $ret; } list ($ret, $thumbnails) = - GalleryCoreApi::loadEntitiesById(array_keys($this->_thumbnailOps)); + GalleryCoreApi::loadEntitiesById(array_keys($this->_thumbnailOps), 'GalleryDerivative'); if ($ret) { GalleryCoreApi::releaseLocks($lockId); return $ret; Modified: trunk/gallery2/modules/flashvideo/module.inc =================================================================== --- trunk/gallery2/modules/flashvideo/module.inc 2007-04-14 04:55:06 UTC (rev 16305) +++ trunk/gallery2/modules/flashvideo/module.inc 2007-04-14 09:18:19 UTC (rev 16306) @@ -32,11 +32,11 @@ $this->setId('flashvideo'); $this->setName($gallery->i18n('Flash Video')); $this->setDescription($gallery->i18n('Enable display of Flash video files')); - $this->setVersion('1.0.1'); + $this->setVersion('1.0.2'); $this->_templateVersion = 1; $this->setGroup('display', $gallery->i18n('Display')); $this->setCallbacks(''); - $this->setRequiredCoreApi(array(7, 20)); + $this->setRequiredCoreApi(array(7, 27)); $this->setRequiredModuleApi(array(3, 6)); } @@ -87,7 +87,7 @@ } while (!empty($ids)) { $itemIds = array_splice($ids, 0, 100); - list ($ret, $items) = GalleryCoreApi::loadEntitiesById($itemIds); + list ($ret, $items) = GalleryCoreApi::loadEntitiesById($itemIds, 'GalleryDataItem'); if ($ret) { return array($ret, null); } Modified: trunk/gallery2/modules/fotokasten/PrintPhotos.inc =================================================================== --- trunk/gallery2/modules/fotokasten/PrintPhotos.inc 2007-04-14 04:55:06 UTC (rev 16305) +++ trunk/gallery2/modules/fotokasten/PrintPhotos.inc 2007-04-14 09:18:19 UTC (rev 16306) @@ -63,7 +63,7 @@ /* Load the necessary item data */ $itemIds = array_keys($cartItemIds); - list ($ret, $items) = GalleryCoreApi::loadEntitiesById($itemIds); + list ($ret, $items) = GalleryCoreApi::loadEntitiesById($itemIds, 'GalleryPhotoItem'); if ($ret) { return array($ret, null); } Modified: trunk/gallery2/modules/fotokasten/module.inc =================================================================== --- trunk/gallery2/modules/fotokasten/module.inc 2007-04-14 04:55:06 UTC (rev 16305) +++ trunk/gallery2/modules/fotokasten/module.inc 2007-04-14 09:18:19 UTC (rev 16306) @@ -36,11 +36,11 @@ $this->setId('fotokasten'); $this->setName($gallery->i18n('Fotokasten')); $this->setDescription($gallery->i18n('Fotokasten Photo Printing Module')); - $this->setVersion('1.0.7'); + $this->setVersion('1.0.8'); $this->_templateVersion = 1; $this->setGroup('commerce', $this->translate('Commerce')); $this->setCallbacks('getSiteAdminViews|getItemLinks'); - $this->setRequiredCoreApi(array(7, 20)); + $this->setRequiredCoreApi(array(7, 27)); $this->setRequiredModuleApi(array(3, 6)); } Modified: trunk/gallery2/modules/getid3/Callbacks.inc =================================================================== --- trunk/gallery2/modules/getid3/Callbacks.inc 2007-04-14 04:55:06 UTC (rev 16305) +++ trunk/gallery2/modules/getid3/Callbacks.inc 2007-04-14 09:18:19 UTC (rev 16306) @@ -31,7 +31,7 @@ case 'LoadGetid3Info': GalleryCoreApi::requireOnce('modules/getid3/classes/Getid3Helper.class'); - list ($ret, $item) = GalleryCoreApi::loadEntitiesById($params['itemId']); + list ($ret, $item) = GalleryCoreApi::loadEntitiesById($params['itemId'], 'GalleryItem'); if ($ret) { return $ret; } Modified: trunk/gallery2/modules/getid3/classes/Getid3Extractor.class =================================================================== --- trunk/gallery2/modules/getid3/classes/Getid3Extractor.class 2007-04-14 04:55:06 UTC (rev 16305) +++ trunk/gallery2/modules/getid3/classes/Getid3Extractor.class 2007-04-14 09:18:19 UTC (rev 16306) @@ -41,7 +41,7 @@ $data = array(); foreach ($itemIds as $itemId) { - list ($ret, $item) = GalleryCoreApi::loadEntitiesById($itemId); + list ($ret, $item) = GalleryCoreApi::loadEntitiesById($itemId, 'GalleryItem'); if ($ret) { return array($ret, null); } Modified: trunk/gallery2/modules/getid3/module.inc =================================================================== --- trunk/gallery2/modules/getid3/module.inc 2007-04-14 04:55:06 UTC (rev 16305) +++ trunk/gallery2/modules/getid3/module.inc 2007-04-14 09:18:19 UTC (rev 16306) @@ -35,11 +35,11 @@ $this->setId('getid3'); $this->setName($gallery->i18n('Getid3')); $this->setDescription($gallery->i18n('A toolkit for getting id3 tag information')); - $this->setVersion('1.0.3'); /* Update upgrade() function below too */ + $this->setVersion('1.0.4'); /* Update upgrade() function below too */ $this->_templateVersion = 1; $this->setGroup('data', $gallery->i18n('Extra Data')); $this->setCallbacks('getSiteAdminViews'); - $this->setRequiredCoreApi(array(7, 20)); + $this->setRequiredCoreApi(array(7, 27)); $this->setRequiredModuleApi(array(3, 6)); } @@ -70,6 +70,7 @@ case '1.0.1': case '1.0.2': /* .mo file migration */ + case '1.0.3': case 'end of upgrade path': break; Modified: trunk/gallery2/modules/hidden/classes/HiddenHelper.class =================================================================== --- trunk/gallery2/modules/hidden/classes/HiddenHelper.class 2007-04-14 04:55:06 UTC (rev 16305) +++ trunk/gallery2/modules/hidden/classes/HiddenHelper.class 2007-04-14 09:18:19 UTC (rev 16306) @@ -182,7 +182,8 @@ return $ret; } if (!empty($childIds)) { - list ($ret, $childItems) = GalleryCoreApi::loadEntitiesById($childIds); + list ($ret, $childItems) = + GalleryCoreApi::loadEntitiesById($childIds, 'GalleryItem'); if ($ret) { return $ret; } @@ -390,7 +391,8 @@ return $ret; } if (!empty($childIds)) { - list ($ret, $childItems) = GalleryCoreApi::loadEntitiesById($childIds); + list ($ret, $childItems) = + GalleryCoreApi::loadEntitiesById($childIds, 'GalleryItem'); if ($ret) { return $ret; } @@ -463,7 +465,7 @@ $oldParentId = $item->getOriginalValue('parentId'); $newParentId = $item->getParentId(); list ($ret, $parents) = - GalleryCoreApi::loadEntitiesById(array($oldParentId, $newParentId)); + GalleryCoreApi::loadEntitiesById(array($oldParentId, $newParentId), 'GalleryItem'); if ($ret) { return $ret; } Modified: trunk/gallery2/modules/hidden/module.inc =================================================================== --- trunk/gallery2/modules/hidden/module.inc 2007-04-14 04:55:06 UTC (rev 16305) +++ trunk/gallery2/modules/hidden/module.inc 2007-04-14 09:18:19 UTC (rev 16306) @@ -38,11 +38,11 @@ $this->setName($gallery->i18n('Hidden Items')); $this->setDescription($gallery->i18n('Hide items/albums from guests until directly ' . 'accessed with the right URL')); - $this->setVersion('1.0.5'); + $this->setVersion('1.0.6'); $this->_templateVersion = 1; $this->setGroup('display', $this->translate('Display')); $this->setCallbacks('registerEventListeners'); - $this->setRequiredCoreApi(array(7, 20)); + $this->setRequiredCoreApi(array(7, 27)); $this->setRequiredModuleApi(array(3, 6)); } @@ -110,7 +110,8 @@ } while (!empty($itemIds)) { - list ($ret, $items) = GalleryCoreApi::loadEntitiesById(array_splice($itemIds, 0, 100)); + list ($ret, $items) = + GalleryCoreApi::loadEntitiesById(array_splice($itemIds, 0, 100), 'GalleryEntity'); if ($ret) { return $ret; } Modified: trunk/gallery2/modules/imageblock/classes/ImageBlockHelper.class =================================================================== --- trunk/gallery2/modules/imageblock/classes/ImageBlockHelper.class 2007-04-14 04:55:06 UTC (rev 16305) +++ trunk/gallery2/modules/imageblock/classes/ImageBlockHelper.class 2007-04-14 09:18:19 UTC (rev 16306) @@ -222,7 +222,7 @@ /* Ignore permission error.. just don't add a block */ return array(null, array()); } - list ($ret, $item) = GalleryCoreApi::loadEntitiesById($parentId); + list ($ret, $item) = GalleryCoreApi::loadEntitiesById($parentId, 'GalleryItem'); if ($ret) { return array($ret, null); } @@ -262,7 +262,7 @@ if ($ret || !$ok) { /* Just pick a new item if this one is inaccessible or missing */ } else { - list ($ret, $item) = GalleryCoreApi::loadEntitiesById($itemId); + list ($ret, $item) = GalleryCoreApi::loadEntitiesById($itemId, 'GalleryItem'); if ($ret) { return array($ret, null); } @@ -305,11 +305,12 @@ foreach ($data as $itemData) { $id = $itemData['id']; - list ($ret, $item) = GalleryCoreApi::loadEntitiesById($id); + list ($ret, $item) = GalleryCoreApi::loadEntitiesById($id, 'GalleryItem'); if ($ret) { return array($ret, null); } - list ($ret, $owner) = GalleryCoreApi::loadEntitiesById($item->getOwnerId()); + list ($ret, $owner) = + GalleryCoreApi::loadEntitiesById($item->getOwnerId(), 'GalleryUser'); if ($ret) { return array($ret, null); } @@ -339,8 +340,9 @@ $source = $image; while (GalleryUtilities::isA($source, 'GalleryDerivative') && $source->getDerivativeType() != DERIVATIVE_TYPE_IMAGE_PREFERRED) { - list ($ret, $source) = - GalleryCoreApi::loadEntitiesById($source->getDerivativeSourceId()); + list ($ret, $source) = GalleryCoreApi::loadEntitiesById( + $source->getDerivativeSourceId(), + array('GalleryFileSystemEntity', 'GalleryDerivative')); if ($ret) { return array($ret, null); } Modified: trunk/gallery2/modules/imageblock/module.inc =================================================================== --- trunk/gallery2/modules/imageblock/module.inc 2007-04-14 04:55:06 UTC (rev 16305) +++ trunk/gallery2/modules/imageblock/module.inc 2007-04-14 09:18:19 UTC (rev 16306) @@ -32,11 +32,11 @@ $this->setId('imageblock'); $this->setName($gallery->i18n('Image Block')); $this->setDescription($gallery->i18n('Random, Most Recent or Most Viewed Photo or Album')); - $this->setVersion('1.1.1'); + $this->setVersion('1.1.2'); $this->_templateVersion = 1; $this->setGroup('blocks', $gallery->i18n('Blocks')); $this->setCallbacks('registerEventListeners|getSiteAdminViews'); - $this->setRequiredCoreApi(array(7, 20)); + $this->setRequiredCoreApi(array(7, 27)); $this->setRequiredModuleApi(array(3, 6)); } Modified: trunk/gallery2/modules/imageblock/test/phpunit/ImageBlockHandlerTest.class =================================================================== --- trunk/gallery2/modules/imageblock/test/phpunit/ImageBlockHandlerTest.class 2007-04-14 04:55:06 UTC (rev 16305) +++ trunk/gallery2/modules/imageblock/test/phpunit/ImageBlockHandlerTest.class 2007-04-14 09:18:19 UTC (rev 16306) @@ -109,7 +109,7 @@ } $this->assert($disabledFlag, 'Add eventHandler failed'); - $ret = GalleryCoreApi::deleteEntityById($this->_handlerItem->getId()); + $ret = GalleryCoreApi::deleteEntityById($this->_handlerItem->getId(), 'GalleryDataItem'); if ($ret) { return $ret; } Modified: trunk/gallery2/modules/imageframe/Sample.inc =================================================================== --- trunk/gallery2/modules/imageframe/Sample.inc 2007-04-14 04:55:06 UTC (rev 16305) +++ trunk/gallery2/modules/imageframe/Sample.inc 2007-04-14 09:18:19 UTC (rev 16306) @@ -52,7 +52,7 @@ $ImageFrameSample = array('list' => $list); $itemId = GalleryUtilities::getRequestVariables('itemId'); if (!empty($itemId)) { - list ($ret, $item) = GalleryCoreApi::loadEntitiesById($itemId); + list ($ret, $item) = GalleryCoreApi::loadEntitiesById($itemId, 'GalleryItem'); if ($ret) { return array($ret, null); } Modified: trunk/gallery2/modules/imageframe/module.inc =================================================================== --- trunk/gallery2/modules/imageframe/module.inc 2007-04-14 04:55:06 UTC (rev 16305) +++ trunk/gallery2/modules/imageframe/module.inc 2007-04-14 09:18:19 UTC (rev 16306) @@ -32,11 +32,11 @@ $this->setId('imageframe'); $this->setName($gallery->i18n('ImageFrame')); $this->setDescription($gallery->i18n('Render frames around images')); - $this->setVersion('1.0.6'); + $this->setVersion('1.0.7'); $this->_templateVersion = 1; $this->setGroup('display', $gallery->i18n('Display')); $this->setCallbacks(''); - $this->setRequiredCoreApi(array(7, 20)); + $this->setRequiredCoreApi(array(7, 27)); $this->setRequiredModuleApi(array(3, 6)); } Modified: trunk/gallery2/modules/itemadd/module.inc =================================================================== --- trunk/gallery2/modules/itemadd/module.inc 2007-04-14 04:55:06 UTC (rev 16305) +++ trunk/gallery2/modules/itemadd/module.inc 2007-04-14 09:18:19 UTC (rev 16306) @@ -33,11 +33,11 @@ $this->setId('itemadd'); $this->setName($gallery->i18n('Add Items')); $this->setDescription($gallery->i18n('Add items from local server or the web')); - $this->setVersion('1.0.1'); + $this->setVersion('1.0.2'); $this->_templateVersion = 1; $this->setGroup('import', $gallery->i18n('Import')); $this->setCallbacks('getSiteAdminViews'); - $this->setRequiredCoreApi(array(7, 20)); + $this->setRequiredCoreApi(array(7, 27)); $this->setRequiredModuleApi(array(3, 6)); } Modified: trunk/gallery2/modules/itemadd/test/phpunit/ItemAddFromServerTest.class =================================================================== --- trunk/gallery2/modules/itemadd/test/phpunit/ItemAddFromServerTest.class 2007-04-14 04:55:06 UTC (rev 16305) +++ trunk/gallery2/modules/itemadd/test/phpunit/ItemAddFromServerTest.class 2007-04-14 09:18:19 UTC (rev 16306) @@ -315,7 +315,7 @@ } if ($addDirectories) { $this->assertEquals(count($dirs), count($ids), 'top child count'); - list ($ret, $subalbums) = GalleryCoreApi::loadEntitiesById($ids); + list ($ret, $subalbums) = GalleryCoreApi::loadEntitiesById($ids, 'GalleryItem'); if ($ret) { return $ret; } @@ -333,7 +333,7 @@ $addDirectoriesString = $addDirectories ? ' addDirectories' : ' !addDirectories'; $this->assertEquals(count($files), count($ids), 'child count' . $addDirectoriesString); - list ($ret, $items) = GalleryCoreApi::loadEntitiesById($ids); + list ($ret, $items) = GalleryCoreApi::loadEntitiesById($ids, 'GalleryItem'); if ($ret) { return $ret; } @@ -411,7 +411,8 @@ $this->assertEquals(1, count($results[1])); $this->assertEquals(1, count($results[1]['addedFiles'])); - list ($ret, $item) = GalleryCoreApi::loadEntitiesById($results[1]['addedFiles'][0]['id']); + list ($ret, $item) = + GalleryCoreApi::loadEntitiesById($results[1]['addedFiles'][0]['id'], 'GalleryDataItem'); if ($ret) { return $ret; } Modified: trunk/gallery2/modules/itemadd/test/phpunit/ItemAddFromWebTest.class =================================================================== --- trunk/gallery2/modules/itemadd/test/phpunit/ItemAddFromWebTest.class 2007-04-14 04:55:06 UTC (rev 16305) +++ trunk/gallery2/modules/itemadd/test/phpunit/ItemAddFromWebTest.class 2007-04-14 09:18:19 UTC (rev 16306) @@ -190,7 +190,7 @@ $i = 0; foreach ($ids as $id) { - list ($ret, $item) = GalleryCoreApi::loadEntitiesById($id); + list ($ret, $item) = GalleryCoreApi::loadEntitiesById($id, 'GalleryItem'); if ($ret) { return $ret; } Modified: trunk/gallery2/modules/keyalbum/KeywordAlbum.inc =================================================================== --- trunk/gallery2/modules/keyalbum/KeywordAlbum.inc 2007-04-14 04:55:06 UTC (rev 16305) +++ trunk/gallery2/modules/keyalbum/KeywordAlbum.inc 2007-04-14 09:18:19 UTC (rev 16306) @@ -65,14 +65,10 @@ if (!empty($itemId)) { /* Viewing an item in this dynamic album */ - list ($ret, $viewItem) = GalleryCoreApi::loadEntitiesById($itemId); + list ($ret, $viewItem) = GalleryCoreApi::loadEntitiesById($itemId, 'GalleryItem'); if ($ret) { return array($ret, null, null, null); } - if (!GalleryUtilities::isA($viewItem, 'GalleryItem')) { - /* Invalid itemId given, return MISSING_OBJECT to get standard error page */ - return array(GalleryCoreApi::error(ERROR_MISSING_OBJECT), null, null, null); - } /* Provide parent, parent URL and get-children function to Theme API */ $item->urlParams = array('view' => 'keyalbum.KeywordAlbum', 'keyword' => $keyword, Modified: trunk/gallery2/modules/keyalbum/module.inc =================================================================== --- trunk/gallery2/modules/keyalbum/module.inc 2007-04-14 04:55:06 UTC (rev 16305) +++ trunk/gallery2/modules/keyalbum/module.inc 2007-04-14 09:18:19 UTC (rev 16306) @@ -32,11 +32,11 @@ $this->setId('keyalbum'); $this->setName($gallery->i18n('Keyword Albums')); $this->setDescription($gallery->i18n('Dynamic albums based on keyword search')); - $this->setVersion('1.0.3'); + $this->setVersion('1.0.4'); $this->_templateVersion = 1; $this->setGroup('display', $gallery->i18n('Display')); $this->setCallbacks('getSiteAdminViews|getItemSummaries'); - $this->setRequiredCoreApi(array(7, 20)); + $this->setRequiredCoreApi(array(7, 27)); $this->setRequiredModuleApi(array(3, 6)); } Modified: trunk/gallery2/modules/linkitem/ItemAddLinkItem.inc =================================================================== --- trunk/gallery2/modules/linkitem/ItemAddLinkItem.inc 2007-04-14 04:55:06 UTC (rev 16305) +++ trunk/gallery2/modules/linkitem/ItemAddLinkItem.inc 2007-04-14 09:18:19 UTC (rev 16306) @@ -228,7 +228,7 @@ if ($ret) { return array($ret, null, null); } - list ($ret, $albums) = GalleryCoreApi::loadEntitiesById($albumIds); + list ($ret, $albums) = GalleryCoreApi::loadEntitiesById($albumIds, 'GalleryAlbumItem'); if ($ret) { return array($ret, null, null); } Modified: trunk/gallery2/modules/linkitem/classes/GalleryLinkItem.class =================================================================== --- trunk/gallery2/modules/linkitem/classes/GalleryLinkItem.class 2007-04-14 04:55:06 UTC (rev 16305) +++ trunk/gallery2/modules/linkitem/classes/GalleryLinkItem.class 2007-04-14 09:18:19 UTC (rev 16306) @@ -68,13 +68,10 @@ } if (is_numeric($link)) { /* Link to an album */ - list ($ret, $linkedAlbum) = GalleryCoreApi::loadEntitiesById($link); + list ($ret, $linkedAlbum) = GalleryCoreApi::loadEntitiesById($link, 'GalleryAlbumItem'); if ($ret) { return $ret; } - if (!Gallery... [truncated message content] |