diff options
| author | Christian Fowler <spider@viovio.com> | 2007-09-15 06:18:04 +0000 |
|---|---|---|
| committer | Christian Fowler <spider@viovio.com> | 2007-09-15 06:18:04 +0000 |
| commit | dc220529bfeaca78d0379d5474554fafbac688d5 (patch) | |
| tree | c34a17f11bd8ef0ada7949a84ad1dfca925d0e65 | |
| parent | d079291da99440ecd92c7dc69d02c1423c7cc764 (diff) | |
| download | fisheye-dc220529bfeaca78d0379d5474554fafbac688d5.tar.gz fisheye-dc220529bfeaca78d0379d5474554fafbac688d5.tar.bz2 fisheye-dc220529bfeaca78d0379d5474554fafbac688d5.zip | |
SCHEMA CHANGE: Major overhaul to liberty attachable by removing attachment_map and only allow attachments to be wired to a single piece of content. removed attachment_map, single and multiple attachments are working, ajax code was removed, and should be put in a separate library/class to handle what to do with 'floating' files waiting for a store
| -rw-r--r-- | FisheyeGallery.php | 5 | ||||
| -rw-r--r-- | FisheyeImage.php | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/FisheyeGallery.php b/FisheyeGallery.php index c8b0e5f..09a7bfe 100644 --- a/FisheyeGallery.php +++ b/FisheyeGallery.php @@ -1,6 +1,6 @@ <?php /** - * @version $Header: /cvsroot/bitweaver/_bit_fisheye/FisheyeGallery.php,v 1.65 2007/09/14 07:06:33 squareing Exp $ + * @version $Header: /cvsroot/bitweaver/_bit_fisheye/FisheyeGallery.php,v 1.66 2007/09/15 06:18:04 spiderr Exp $ * @package fisheye */ @@ -144,8 +144,7 @@ class FisheyeGallery extends FisheyeBase { $query = "SELECT fgim.*, fi.`image_id`, lf.`storage_path` FROM `".BIT_DB_PREFIX."fisheye_gallery_image_map` fgim INNER JOIN `".BIT_DB_PREFIX."fisheye_image` fi ON ( fi.`content_id`=fgim.`item_content_id` ) - INNER JOIN `".BIT_DB_PREFIX."liberty_attachments_map` lam ON ( lam.`content_id`=fi.`content_id` ) - INNER JOIN `".BIT_DB_PREFIX."liberty_attachments` la ON ( la.`attachment_id`=lam.`attachment_id` ) + INNER JOIN `".BIT_DB_PREFIX."liberty_attachments` la ON ( fi.`content_id`=la.`content_id` ) INNER JOIN `".BIT_DB_PREFIX."liberty_files` lf ON ( lf.`file_id`=la.`foreign_id` ) WHERE fgim.`gallery_content_id` = ? ORDER BY fgim.`item_position`, fi.`content_id` "; diff --git a/FisheyeImage.php b/FisheyeImage.php index da93a85..b40d6aa 100644 --- a/FisheyeImage.php +++ b/FisheyeImage.php @@ -1,6 +1,6 @@ <?php /** - * @version $Header: /cvsroot/bitweaver/_bit_fisheye/FisheyeImage.php,v 1.71 2007/09/13 15:29:53 spiderr Exp $ + * @version $Header: /cvsroot/bitweaver/_bit_fisheye/FisheyeImage.php,v 1.72 2007/09/15 06:18:04 spiderr Exp $ * @package fisheye */ @@ -662,8 +662,7 @@ class FisheyeImage extends FisheyeBase { $query = "SELECT $distinct fi.`image_id` AS `hash_key`, fi.*, lf.*, lc.*, fg.`gallery_id`, uu.`login`, uu.`real_name` $select $selectSql FROM `".BIT_DB_PREFIX."fisheye_image` fi - INNER JOIN `".BIT_DB_PREFIX."liberty_attachments_map` lam ON(lam.`content_id`=fi.`content_id`) - INNER JOIN `".BIT_DB_PREFIX."liberty_attachments` la ON(la.`attachment_id`=lam.`attachment_id`) + INNER JOIN `".BIT_DB_PREFIX."liberty_attachments` la ON(la.`content_id`=fi.`content_id`) INNER JOIN `".BIT_DB_PREFIX."liberty_files` lf ON(la.`foreign_id`=lf.`file_id`) , `".BIT_DB_PREFIX."users_users` uu, `".BIT_DB_PREFIX."liberty_content` lc $join LEFT OUTER JOIN `".BIT_DB_PREFIX."fisheye_gallery_image_map` tfgim2 ON(tfgim2.`item_content_id`=lc.`content_id`) |