diff options
| author | Lester Caine <lester@lsces.co.uk> | 2006-01-29 19:04:16 +0000 |
|---|---|---|
| committer | Lester Caine <lester@lsces.co.uk> | 2006-01-29 19:04:16 +0000 |
| commit | 6c53eb65c30352001e9916b8fc336f4c6d9cd8b5 (patch) | |
| tree | 8366344670c3ff697bbcee1ea9a6151a63e581c6 /BitArticle.php | |
| parent | c43a48aa0c738ebe7873e8f28c04264580ab9be7 (diff) | |
| download | articles-6c53eb65c30352001e9916b8fc336f4c6d9cd8b5.tar.gz articles-6c53eb65c30352001e9916b8fc336f4c6d9cd8b5.tar.bz2 articles-6c53eb65c30352001e9916b8fc336f4c6d9cd8b5.zip | |
Restore reserved word fix ;)
Diffstat (limited to 'BitArticle.php')
| -rw-r--r-- | BitArticle.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/BitArticle.php b/BitArticle.php index b4a8027..2951655 100644 --- a/BitArticle.php +++ b/BitArticle.php @@ -1,6 +1,6 @@ <?php /** - * @version $Header: /cvsroot/bitweaver/_bit_articles/BitArticle.php,v 1.49 2006/01/26 14:56:29 squareing Exp $ + * @version $Header: /cvsroot/bitweaver/_bit_articles/BitArticle.php,v 1.50 2006/01/29 19:04:16 lsces Exp $ * @package article * * Copyright( c )2004 bitweaver.org @@ -9,14 +9,14 @@ * All Rights Reserved. See copyright.txt for details and a complete list of authors. * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details * - * $Id: BitArticle.php,v 1.49 2006/01/26 14:56:29 squareing Exp $ + * $Id: BitArticle.php,v 1.50 2006/01/29 19:04:16 lsces Exp $ * * Article class is used when accessing BitArticles. It is based on TikiSample * and builds on core bitweaver functionality, such as the Liberty CMS engine. * * created 2004/8/15 * @author wolffy <wolff_borg@yahoo.com.au> - * @version $Revision: 1.49 $ $Date: 2006/01/26 14:56:29 $ $Author: squareing $ + * @version $Revision: 1.50 $ $Date: 2006/01/29 19:04:16 $ $Author: lsces $ */ /** @@ -642,13 +642,13 @@ class BitArticle extends LibertyAttachable { $bindvars[] = ( int )$timestamp; } - $query = "SELECT ta.*, tc.*, top.*, type.*, tas.`status_name`, + $query = "SELECT ta.*, tc.*, top.*, tatype.*, tas.`status_name`, tf.`storage_path` as `image_storage_path` FROM `".BIT_DB_PREFIX."tiki_articles` ta INNER JOIN `".BIT_DB_PREFIX."tiki_content` tc ON( tc.`content_id` = ta.`content_id` ) INNER JOIN `".BIT_DB_PREFIX."tiki_article_status` tas ON( tas.`status_id` = ta.`status_id` ) LEFT OUTER JOIN `".BIT_DB_PREFIX."tiki_article_topics` top ON( top.`topic_id` = ta.`topic_id` ) - LEFT OUTER JOIN `".BIT_DB_PREFIX."tiki_article_types` type ON( type.`article_type_id` = ta.`article_type_id` ) + LEFT OUTER JOIN `".BIT_DB_PREFIX."tiki_article_types` tatype ON( tatype.`article_type_id` = ta.`article_type_id` ) LEFT OUTER JOIN `".BIT_DB_PREFIX."tiki_attachments` tat ON( tat.`attachment_id` = ta.`image_attachment_id` ) LEFT OUTER JOIN `".BIT_DB_PREFIX."tiki_files` tf ON( tf.`file_id` = tat.`foreign_id` ) ".( !empty( $mid ) ? $mid.' AND ' : ' WHERE ' )." tc.`content_type_guid` = '".BITARTICLE_CONTENT_TYPE_GUID."' |