diff options
| author | Max Kremmel <xing@synapse.plus.com> | 2006-02-02 09:21:28 +0000 |
|---|---|---|
| committer | Max Kremmel <xing@synapse.plus.com> | 2006-02-02 09:21:28 +0000 |
| commit | 44c930bf0a4e11dc03e12af7a024890338f5047b (patch) | |
| tree | 702fd91e58849265bd31ff1ea1fe6871c7addb2b | |
| parent | f5f6b1402682b739a78246aaebae40fd00f15279 (diff) | |
| download | liberty-44c930bf0a4e11dc03e12af7a024890338f5047b.tar.gz liberty-44c930bf0a4e11dc03e12af7a024890338f5047b.tar.bz2 liberty-44c930bf0a4e11dc03e12af7a024890338f5047b.zip | |
detikify
| -rw-r--r-- | admin/schema_inc.php | 11 | ||||
| -rw-r--r-- | edit_storage_inc.php | 4 | ||||
| -rw-r--r-- | plugins/storage.bitfile.php | 3 |
3 files changed, 4 insertions, 14 deletions
diff --git a/admin/schema_inc.php b/admin/schema_inc.php index 04874e7..c614cbc 100644 --- a/admin/schema_inc.php +++ b/admin/schema_inc.php @@ -31,7 +31,7 @@ $tables = array( ip C(15), comment C(200), data X - CONSTRAINTS ', CONSTRAINT `tiki_history_page_ref` FOREIGN KEY (`page_id`) REFERENCES `".BIT_DB_PREFIX."wiki_pages`( `page_id` )' + CONSTRAINTS ', CONSTRAINT `liberty_history_page_ref` FOREIGN KEY (`page_id`) REFERENCES `".BIT_DB_PREFIX."wiki_pages`( `page_id` )' ", 'liberty_content_links' => " @@ -103,15 +103,6 @@ $tables = array( , CONSTRAINT `liberty_attachment_type_ref` FOREIGN KEY (`attachment_plugin_guid`) REFERENCES `".BIT_DB_PREFIX."liberty_plugins`( `plugin_guid` )' ", -//'tiki_blobs' => ' -// blob_id I4 PRIMARY, -// user_id I4 NOTNULL, -// blob_size I8 NOTNULL, -// blob_name C(250) NOTNULL, -// blob_data_type C(100) NOTNULL, -// blob_data B NOTNULL -//', - 'liberty_files' => " file_id I4 PRIMARY, user_id I4 NOTNULL, diff --git a/edit_storage_inc.php b/edit_storage_inc.php index 6ee7086..760df61 100644 --- a/edit_storage_inc.php +++ b/edit_storage_inc.php @@ -3,7 +3,7 @@ * edit_storage_inc * * @author spider <spider@steelsun.com> - * @version $Revision: 1.8 $ + * @version $Revision: 1.9 $ * @package liberty * @subpackage functions * @@ -36,7 +36,7 @@ if( !empty( $_REQUEST['deleteAttachment'] ) ) { $attachmentInfo = $gContent->getAttachment( $attachmentId ); if( count( $siblingAttachments ) > 0 || ( !$gBitUser->isAdmin() && $gBitUser->mUserId != $attachmentInfo['user_id'] && $gBitUser->mPerms['bit_p_detach_attachment'] == 'y' ) ) { - // Other tiki_attachment rows reference the same foreign_id so we should just detach + // Other liberty_attachment rows reference the same foreign_id so we should just detach $gContent->detachAttachment( $attachmentId ); } else { $gContent->expungeAttachment( $attachmentId ); diff --git a/plugins/storage.bitfile.php b/plugins/storage.bitfile.php index 009b7e7..8203cfe 100644 --- a/plugins/storage.bitfile.php +++ b/plugins/storage.bitfile.php @@ -1,6 +1,6 @@ <?php /** - * @version $Revision: 1.12 $ + * @version $Revision: 1.13 $ * @package liberty * @subpackage plugins_storage */ @@ -43,7 +43,6 @@ function bit_files_store( &$pStoreRow ) { $pref = $gBitSystem->getPreference('centralized_upload_dir'); if( isset( $pref ) ) { if( !empty( $pStoreRow['foreign_id'] ) ) { - //$sql = "UPDATE tiki_attachment SET `binary_id`=NULL, `storage_path`=? WHERE `user_id`=? AND storage_id=?"; $sql = "UPDATE `".BIT_DB_PREFIX."liberty_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 { |