From 578e1dbf265642c5866c3083dd4605a6624174f2 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Sat, 30 Aug 2003 06:21:34 +0000 Subject: [PATCH] Update cache validation timestamp on uploads / re-uploads --- includes/GlobalFunctions.php | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php index b6571ff9d8..a1021e2842 100644 --- a/includes/GlobalFunctions.php +++ b/includes/GlobalFunctions.php @@ -390,10 +390,13 @@ function wfRecordUpload( $name, $oldver, $size, $desc ) "img_user_text FROM image WHERE img_name='" . wfStrencode( $name ) . "'"; $res = wfQuery( $sql, $fname ); + $now = wfTimestampNow(); + $won = wfInvertTimestamp( $now ); + if ( 0 == wfNumRows( $res ) ) { $sql = "INSERT INTO image (img_name,img_size,img_timestamp," . "img_description,img_user,img_user_text) VALUES ('" . - wfStrencode( $name ) . "',{$size},'" . wfTimestampNow() . "','" . + wfStrencode( $name ) . "',{$size},'{$now}','" . wfStrencode( $desc ) . "', '" . $wgUser->getID() . "', '" . wfStrencode( $wgUser->getName() ) . "')"; wfQuery( $sql, $fname ); @@ -403,8 +406,6 @@ function wfRecordUpload( $name, $oldver, $size, $desc ) wfStrencode( $name ) . "'"; $res = wfQuery( $sql, $fname ); if ( 0 == wfNumRows( $res ) ) { - $now = wfTimestampNow(); - $won = wfInvertTimestamp( $now ); $common = Namespace::getImage() . ",'" . wfStrencode( $name ) . "','" . @@ -413,9 +414,9 @@ function wfRecordUpload( $name, $oldver, $size, $desc ) "',1"; $sql = "INSERT INTO cur (cur_namespace,cur_title," . "cur_comment,cur_user,cur_user_text,cur_timestamp,cur_is_new," . - "cur_text,inverse_timestamp) VALUES (" . + "cur_text,inverse_timestamp,cur_touched) VALUES (" . $common . - ",'" . wfStrencode( $desc ) . "','{$won}')"; + ",'" . wfStrencode( $desc ) . "','{$won}','{$now}')"; wfQuery( $sql, $fname ); $id = wfInsertId() or 0; # We should throw an error instead $sql = "INSERT INTO recentchanges (rc_namespace,rc_title, @@ -445,6 +446,11 @@ function wfRecordUpload( $name, $oldver, $size, $desc ) wfStrencode( $desc ) . "' WHERE img_name='" . wfStrencode( $name ) . "'"; wfQuery( $sql, $fname ); + + $sql = "UPDATE cur SET cur_touched='{$now}' WHERE cur_namespace=" . + Namespace::getImage() . " AND cur_title='" . + wfStrencode( $name ) . "'"; + wfQuery( $sql, $fname ); } $log = new LogPage( wfMsg( "uploadlogpage" ), wfMsg( "uploadlogpagetext" ) ); -- 2.20.1