summaryrefslogtreecommitdiff
path: root/plugins/storage.bitfile.php
diff options
context:
space:
mode:
authorMax Kremmel <xing@synapse.plus.com>2005-08-11 13:03:46 +0000
committerMax Kremmel <xing@synapse.plus.com>2005-08-11 13:03:46 +0000
commit5d100e8078e5a53a70aee8a29080fa00559b4972 (patch)
treed2f6d528c57261ce3036adaf7d28ff945f46feee /plugins/storage.bitfile.php
parentea82e999f8043ba0821df00ddc84df38c6c48c1c (diff)
downloadliberty-5d100e8078e5a53a70aee8a29080fa00559b4972.tar.gz
liberty-5d100e8078e5a53a70aee8a29080fa00559b4972.tar.bz2
liberty-5d100e8078e5a53a70aee8a29080fa00559b4972.zip
merge recent changes with HEAD - keeping stuff up to date in case someone starts going nuts in HEAD
Diffstat (limited to 'plugins/storage.bitfile.php')
-rw-r--r--plugins/storage.bitfile.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/storage.bitfile.php b/plugins/storage.bitfile.php
index ea0589a..ad9a1cd 100644
--- a/plugins/storage.bitfile.php
+++ b/plugins/storage.bitfile.php
@@ -1,6 +1,6 @@
<?php
/**
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
* @package liberty
* @subpackage plugins_storage
*/
@@ -47,7 +47,7 @@ function bit_files_store( &$pStoreRow ) {
$sql = "UPDATE `".BIT_DB_PREFIX."tiki_files SET `storage_path`=?, `mime_type`=?, `size`=? WHERE `file_id` = ?";
$gBitSystem->mDb->query( $sql, array( $pStoreRow['dest_file_path'], $pStoreRow['type'], $pStoreRow['size'], $pStoreRow['foreign_id'] ) );
} else {
- $pStoreRow['file_id'] = $gBitSystem->GenID( 'tiki_files_file_id_seq' );
+ $pStoreRow['file_id'] = $gBitSystem->mDb->GenID( 'tiki_files_file_id_seq' );
$sql = "INSERT INTO `".BIT_DB_PREFIX."tiki_files` ( `storage_path`, `file_id`, `mime_type`, `size`, `user_id` ) VALUES ( ?, ?, ?, ?, ? )";
$userId = !empty( $pStoreRow['upload']['user_id'] ) ? $pStoreRow['upload']['user_id'] : $gBitUser->mUserId;
$gBitSystem->mDb->query($sql, array( $pStoreRow['upload']['dest_path'].$pStoreRow['upload']['name'], $pStoreRow['file_id'], $pStoreRow['upload']['type'], $pStoreRow['upload']['size'], $userId ) );