X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2FUserTalkUpdate.php;h=95cfa7e00eae34e5f19d758df44798ae8330d716;hb=facfb655f76ec06a8a8bf571d9c43fb57650e1c8;hp=49ea3057370c7c7e30c9c004bb75dbd11c0295ff;hpb=239ace1ee4e32cd8757a3606e293bfb07b68a939;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/UserTalkUpdate.php b/includes/UserTalkUpdate.php
index 49ea305737..95cfa7e00e 100644
--- a/includes/UserTalkUpdate.php
+++ b/includes/UserTalkUpdate.php
@@ -1,4 +1,4 @@
-<?
+<?php
 # See deferred.doc
 
 class UserTalkUpdate {
@@ -33,23 +33,26 @@ class UserTalkUpdate {
 		} else {
 			# Not ours.  If writing, mark it as modified.
 
+			$sql = false;
+			$dbw =& wfGetDB( DB_MASTER );
+			$user_newtalk = $dbw->tableName( 'user_newtalk' );
+
 			if ( 1 == $this->mAction ) {
 				$user = new User();				
 				$user->setID(User::idFromName($this->mTitle));
 				if ($id=$user->getID()) {									
-					$sql = "INSERT INTO user_newtalk (user_id) values ({$id})";
+					$sql = "INSERT INTO $user_newtalk (user_id) values ({$id})";
 					$wgMemc->delete( "$wgDBname:user:id:$id" );
 				} else {
 					#anon
 					if(preg_match("/^\d{1,3}\.\d{1,3}.\d{1,3}\.\d{1,3}$/",$this->mTitle)) { #real anon (user:xxx.xxx.xxx.xxx)
-						$sql = "INSERT INTO user_newtalk (user_id,user_ip) values (0,\"{$this->mTitle}\")";		
-						#$wgMemc->delete( "$wgDBname:newtalk:ip:$this->mTitle" );
-						$wgMemc->set( "$wgDBname:newtalk:ip:$this->mTitle", "1", time() );
+						$sql = "INSERT INTO $user_newtalk (user_id,user_ip) values (0,\"{$this->mTitle}\")";		
+						$wgMemc->delete( "$wgDBname:newtalk:ip:$this->mTitle" );
 					}
 				}
 				
 				if($sql && !$user->getNewtalk()) { # only insert if real user and it's not already there
-					wfQuery( $sql, DB_WRITE, $fname );
+					$dbw->query( $sql, $fname );
 				}
 			}
 		}