diff options
| author | Christian Fowler <spider@viovio.com> | 2006-01-25 18:34:54 +0000 |
|---|---|---|
| committer | Christian Fowler <spider@viovio.com> | 2006-01-25 18:34:54 +0000 |
| commit | d8f13eb594e9e034b5d7c5512f07f676ac311df7 (patch) | |
| tree | ca1234600c2dbaa439fadc173c60eb47498e911e /plugins/storage.bitfile.php | |
| parent | 934e8af6fda5409746ae5a72bb3b98b443b2234f (diff) | |
| download | liberty-d8f13eb594e9e034b5d7c5512f07f676ac311df7.tar.gz liberty-d8f13eb594e9e034b5d7c5512f07f676ac311df7.tar.bz2 liberty-d8f13eb594e9e034b5d7c5512f07f676ac311df7.zip | |
more removal of fields use. this is actually healthier code because it simplifies things
Diffstat (limited to 'plugins/storage.bitfile.php')
| -rw-r--r-- | plugins/storage.bitfile.php | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/plugins/storage.bitfile.php b/plugins/storage.bitfile.php index 30dc276..67595cd 100644 --- a/plugins/storage.bitfile.php +++ b/plugins/storage.bitfile.php @@ -1,6 +1,6 @@ <?php /** - * @version $Revision: 1.8 $ + * @version $Revision: 1.9 $ * @package liberty * @subpackage plugins_storage */ @@ -67,8 +67,7 @@ function bit_files_load( $pRow ) { $query = "SELECT * FROM `".BIT_DB_PREFIX."tiki_attachments` ta INNER JOIN `".BIT_DB_PREFIX."tiki_files` tf ON (tf.`file_id` = ta.`foreign_id`) WHERE ta.`foreign_id` = ? AND ta.`content_id` = ?"; - if( $rs = $gBitSystem->mDb->query($query, array( $pRow['foreign_id'], $pRow['content_id'] )) ) { - $ret = $rs->fields; + if( $ret = $gBitSystem->mDb->getRow($query, array( $pRow['foreign_id'], $pRow['content_id'] )) ) { $canThumbFunc = liberty_get_function( 'can_thumbnail' ); if ( file_exists( BIT_ROOT_PATH.dirname( $ret['storage_path'] ).'/medium.jpg' ) ) { $ret['thumbnail_url']['avatar'] = BIT_ROOT_URL.dirname( $ret['storage_path'] ).'/avatar.jpg'; @@ -104,12 +103,10 @@ function bit_files_expunge( $pStorageId ) { if (is_numeric($pStorageId)) { $sql = "SELECT * FROM `".BIT_DB_PREFIX."tiki_attachments` WHERE `attachment_id` = ?"; - $rs = $gBitSystem->mDb->query($sql, array($pStorageId)); - $row = &$rs->fields; + $row = $gBitSystem->mDb->getRow($sql, array($pStorageId)); if ($row) { $sql = "SELECT * FROM `".BIT_DB_PREFIX."tiki_files` WHERE `file_id` = ?"; - $fileRs = $gBitSystem->mDb->query($sql, array($row['foreign_id']) ); - $fileRow = &$fileRs->fields; + $fileRow = $gBitSystem->mDb->getRow($sql, array($row['foreign_id']) ); if ($fileRow) { $absolutePath = BIT_ROOT_PATH.'/'.$fileRow['storage_path']; |