summaryrefslogtreecommitdiff
path: root/admin
diff options
context:
space:
mode:
authorNick Palmer <nick@sluggardy.net>2007-09-23 18:17:22 +0000
committerNick Palmer <nick@sluggardy.net>2007-09-23 18:17:22 +0000
commit7c86e056d8231ee4a9777fa59e53d6d4d3b07187 (patch)
treeb2fc3e6c1bccbff36d2cc406dff002181a94b9e1 /admin
parent4e6433c37c988f7b445cdc844af8092cb407525f (diff)
downloadliberty-7c86e056d8231ee4a9777fa59e53d6d4d3b07187.tar.gz
liberty-7c86e056d8231ee4a9777fa59e53d6d4d3b07187.tar.bz2
liberty-7c86e056d8231ee4a9777fa59e53d6d4d3b07187.zip
Changes to get ajax attachments working again. You must turn on the new storage.existing plugin to get them to work.
Diffstat (limited to 'admin')
-rw-r--r--admin/schema_inc.php2
-rw-r--r--admin/upgrade_inc.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/admin/schema_inc.php b/admin/schema_inc.php
index 206c9b0..0508e9c 100644
--- a/admin/schema_inc.php
+++ b/admin/schema_inc.php
@@ -123,7 +123,7 @@ $tables = array(
'liberty_attachments' => "
attachment_id I4 PRIMARY,
- content_id I4 NOTNULL,
+ content_id I4,
attachment_plugin_guid C(16) NOTNULL,
foreign_id I4 NOTNULL,
user_id I4 NOTNULL,
diff --git a/admin/upgrade_inc.php b/admin/upgrade_inc.php
index 99db899..17a58f9 100644
--- a/admin/upgrade_inc.php
+++ b/admin/upgrade_inc.php
@@ -662,7 +662,7 @@ array( 'QUERY' =>
"UPDATE `".BIT_DB_PREFIX."liberty_attachments` la INNER JOIN `".BIT_DB_PREFIX."liberty_content` lc ON( lc.`primary_attachment_id` = la.`attachment_id` ) SET `is_primary` = 'y'",
// now we do the generic update
- "UPDATE `".BIT_DB_PREFIX."liberty_attachments` la SET `content_id` = ( SELECT `content_id` FROM `".BIT_DB_PREFIX."liberty_attachments_map` WHERE `attachment_id` = la.`attachment_id` LIMIT 1 ) WHERE la.`content_id` <> NULL;",
+ "UPDATE `".BIT_DB_PREFIX."liberty_attachments` la SET `content_id` = ( SELECT `content_id` FROM `".BIT_DB_PREFIX."liberty_attachments_map` WHERE `attachment_id` = la.`attachment_id` LIMIT 1 ) WHERE la.`content_id` <> NULL",
)),
),