summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--LibertyContent.php24
-rw-r--r--admin/schema_inc.php2
-rw-r--r--admin/upgrade_inc.php11
3 files changed, 17 insertions, 20 deletions
diff --git a/LibertyContent.php b/LibertyContent.php
index 162ace5..34085c2 100644
--- a/LibertyContent.php
+++ b/LibertyContent.php
@@ -3,7 +3,7 @@
* Management of Liberty content
*
* @package liberty
-* @version $Header: /cvsroot/bitweaver/_bit_liberty/LibertyContent.php,v 1.298 2007/09/27 13:49:15 spiderr Exp $
+* @version $Header: /cvsroot/bitweaver/_bit_liberty/LibertyContent.php,v 1.299 2007/09/27 15:39:04 spiderr Exp $
* @author spider <spider@steelsun.com>
*/
@@ -471,8 +471,8 @@ class LibertyContent extends LibertyBase {
"user_id" => $this->getField( "modifier_user_id" ),
"ip" => $this->getField( "ip" ),
"data" => $this->getField( "data" ),
- "history_comment" => substr( $this->getField( "edit_comment" ), 0, 200 ),
- "description" => substr( $this->getField( "description" ), 0, 200 ),
+ "summary" => $this->getField( "summary" ),
+ "history_comment" => (string)substr( $this->getField( "edit_comment" ), 0, 200 ),
"format_guid" => $this->getField( "format_guid", $gBitSystem->getConfig( "default_format", "tikiwiki" )),
);
$this->mDb->associateInsert( BIT_DB_PREFIX."liberty_content_history", $storeHash );
@@ -1326,13 +1326,12 @@ SOOOO many joins on this function. so much work makes it highly inefficient sinc
global $gBitUser,$gBitSystem;
if( empty( $_REQUEST['post_comment_submit'] ) && empty( $_REQUEST['post_comment_request'] ) ) {
if( @BitBase::verifyId( $this->mContentId ) && (($gBitUser->isRegistered() && !$this->isOwner()) || ($gBitUser->getField('user_id') == ANONYMOUS_USER_ID)) && !$gBitUser->isAdmin() ) {
- $query = "UPDATE `".BIT_DB_PREFIX."liberty_content_hits` SET `hits`=`hits`+1, `last_hit`= ? WHERE `content_id` = ?";
- $result = $this->mDb->query( $query, array( $gBitSystem->getUTCTime(), $this->mContentId ) );
- $affected_rows = $this->mDb->Affected_Rows();
- if( !$affected_rows ) {
+ if( $this->mDb->getOne( "SELECT `content_id` FROM `".BIT_DB_PREFIX."liberty_content_data` WHERE `content_id`=? AND `data_type`=?", array( $this->mContentId, $pType ) ) ) {
+ $query = "UPDATE `".BIT_DB_PREFIX."liberty_content_hits` SET `hits`=`hits`+1, `last_hit`= ? WHERE `content_id` = ?";
+ } else {
$query = "INSERT INTO `".BIT_DB_PREFIX."liberty_content_hits` ( `hits`, `last_hit`, `content_id` ) VALUES (?,?,?)";
- $result = $this->mDb->query( $query, array( 1, $gBitSystem->getUTCTime(), $this->mContentId ) );
}
+ $result = $this->mDb->query( $query, array( 1, $gBitSystem->getUTCTime(), $this->mContentId ) );
}
}
return TRUE;
@@ -2693,13 +2692,12 @@ SOOOO many joins on this function. so much work makes it highly inefficient sinc
if( empty( $pData ) ) {
$this->mDb->query( "DELETE FROM `".BIT_DB_PREFIX."liberty_content_data` WHERE `content_id`=? AND `data_type`=?", array( $this->mContentId, $pType ) );
} else {
- $query = "UPDATE `".BIT_DB_PREFIX."liberty_content_data` SET `data`= ? WHERE `content_id` = ? AND `data_type`=?";
- $result = $this->mDb->query( $query, array( $pData, $this->mContentId, $pType ) );
- $affected = $this->mDb->Affected_Rows();
- if( !$affected ) {
+ if( $this->mDb->getOne( "SELECT `content_id` FROM `".BIT_DB_PREFIX."liberty_content_data` WHERE `content_id`=? AND `data_type`=?", array( $this->mContentId, $pType ) ) ) {
+ $query = "UPDATE `".BIT_DB_PREFIX."liberty_content_data` SET `data`= ? WHERE `content_id` = ? AND `data_type`=?";
+ } else {
$query = "INSERT INTO `".BIT_DB_PREFIX."liberty_content_data` ( `data`, `content_id`, `data_type` ) VALUES (?,?,?)";
- $result = $this->mDb->query( $query, array( $pData, $this->mContentId, $pType ) );
}
+ $result = $this->mDb->query( $query, array( $pData, $this->mContentId, $pType ) );
}
}
return TRUE;
diff --git a/admin/schema_inc.php b/admin/schema_inc.php
index 6f37cb2..f34abb7 100644
--- a/admin/schema_inc.php
+++ b/admin/schema_inc.php
@@ -64,7 +64,7 @@ $tables = array(
version I4 PRIMARY,
last_modified I8 NOTNULL,
format_guid C(16) NOTNULL,
- description C(200),
+ summary X,
user_id C(40),
ip C(15),
history_comment C(200),
diff --git a/admin/upgrade_inc.php b/admin/upgrade_inc.php
index a4de993..4ce4f3b 100644
--- a/admin/upgrade_inc.php
+++ b/admin/upgrade_inc.php
@@ -106,9 +106,6 @@ array( 'DATADICT' => array(
'object_id' => array( '`content_id`', 'I4' ),
'is_revoked' => array( '`is_revoked`', 'VARCHAR(1)' ),
),
- 'liberty_content_history' => array(
- 'summary' => array( '`summary`', 'X' )
- ),
)),
/* The installer can't add constraints after table creation yet so drop this constraint.
array( 'SQL' => array(
@@ -290,6 +287,7 @@ array( 'DATADICT' => array(
array( 'ALTER' => array (
'liberty_content_history' => array(
'content_id' => array( '`content_id`', 'I4' ),
+ 'summary' => array( '`summary`', 'X' ),
),
'liberty_content' => array(
'version' => array( '`version`', 'I4' ),
@@ -300,13 +298,14 @@ array( 'DATADICT' => array(
array( 'QUERY' =>
array( 'SQL92' => array(
"UPDATE `".BIT_DB_PREFIX."liberty_content_history` SET `content_id`=(SELECT `content_id` FROM `".BIT_DB_PREFIX."tiki_pages` wp WHERE wp.`page_id`=`".BIT_DB_PREFIX."liberty_content_history`.`page_id`)",
- "UPDATE `".BIT_DB_PREFIX."liberty_content` SET version=(SELECT `version` from `".BIT_DB_PREFIX."tiki_pages` wp WHERE wp.`content_id`=`".BIT_DB_PREFIX."liberty_content`.`content_id`)"
+ "UPDATE `".BIT_DB_PREFIX."liberty_content` SET version=(SELECT `version` from `".BIT_DB_PREFIX."tiki_pages` wp WHERE wp.`content_id`=`".BIT_DB_PREFIX."liberty_content`.`content_id`)",
+ "UPDATE `".BIT_DB_PREFIX."liberty_content_history` SET `summary`=`decription`",
)),
),
array( 'DATADICT' => array(
array( 'DROPCOLUMN' => array(
- 'liberty_content_history' => array( '`page_id`' ),
+ 'liberty_content_history' => array( '`page_id`', '`description`' ),
'tiki_pages' => array( '`version`' ),
)),
)),
@@ -596,7 +595,7 @@ array( 'DATADICT' => array(
)),
array( 'QUERY' =>
array( 'SQL92' => array(
- "UPDATE `".BIT_DB_PREFIX."liberty_action_log` SET `content_id`=( SELECT `content_id` FROM `".BIT_DB_PREFIX."tiki_pages` tp WHERE tp.`page_id`=`".BIT_DB_PREFIX."liberty_action_log`.`page_id` )"
+ "UPDATE `".BIT_DB_PREFIX."liberty_action_log` SET `content_id`=( SELECT `content_id` FROM `".BIT_DB_PREFIX."tiki_pages` tp WHERE tp.`page_id`=`".BIT_DB_PREFIX."liberty_action_log`.`page_id` )",
)),
),
array( 'DATADICT' => array(
generated by cgit v1.3 (git 2.53.0) at 2026-07-05 16:01:48 +0000