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

diff --git a/includes/UserTalkUpdate.php b/includes/UserTalkUpdate.php
index 777f5f4c81..95cfa7e00e 100644
--- a/includes/UserTalkUpdate.php
+++ b/includes/UserTalkUpdate.php
@@ -1,4 +1,4 @@
-<?
+<?php
 # See deferred.doc
 
 class UserTalkUpdate {
@@ -33,28 +33,29 @@ 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})";
-					$wgMemc->delete( "$wgDBname:user:user_id:$id" );
-				} else { #anon
-					
+					$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}\")";		
-					}					
-				
+						$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, $fname );
+					$dbw->query( $sql, $fname );
 				}
 			}
 		}
-		
-	
 	}
 }