typo

[lhc/web/wiklou.git] / includes / WatchedItem.php

diff --git a/includes/WatchedItem.php b/includes/WatchedItem.php
index ba60d00..23ad280 100644 (file)
--- a/includes/WatchedItem.php
+++ b/includes/WatchedItem.php
@@ -1,4 +1,4 @@
-<?
+<?php
 
 class WatchedItem {
 
@@ -25,21 +25,33 @@ class WatchedItem {
                global $wgMemc;
                $key = $this->watchKey();
                $iswatched = $wgMemc->get( $key );
-               if( $iswatched !== false ) return $iswatched;
+               if( is_integer( $iswatched ) ) return $iswatched;
                
                $sql = "SELECT 1 FROM watchlist WHERE wl_user=$this->id AND wl_namespace=$this->ns AND wl_title='$this->eti'";
                $res = wfQuery( $sql, DB_READ );
-               $iswatched = (wfNumRows( $res ) > 0);
+               $iswatched = (wfNumRows( $res ) > 0) ? 1 : 0;
                $wgMemc->set( $key, $iswatched );
                return $iswatched;
        }
 
        function addWatch()
        {
+               global $wgIsMySQL;
                # REPLACE instead of INSERT because occasionally someone
                # accidentally reloads a watch-add operation.
-               $sql = "REPLACE INTO watchlist (wl_user, wl_namespace,wl_title) VALUES ($this->id,$this->ns,'$this->eti')";
-               $res = wfQuery( $sql, DB_WRITE );
+               if ($wgIsMySQL) {
+                       $sql = "REPLACE INTO watchlist (wl_user, wl_namespace,wl_title) ". 
+                               "VALUES ($this->id,$this->ns,'$this->eti')";
+                       $res = wfQuery( $sql, DB_WRITE );
+               } else {
+                       $sql = "DELETE FROM watchlist WHERE wl_user=$this->id AND
+                                       wl_namespace=$this->ns AND wl_title='$this->eti'";
+                       wfQuery( $sql, DB_WRITE);
+                       $sql = "INSERT INTO watchlist (wl_user, wl_namespace,wl_title) ". 
+                               "VALUES ($this->id,$this->ns,'$this->eti')";
+                       $res = wfQuery( $sql, DB_WRITE );
+               }
+
                if( $res === false ) return false;
                
                global $wgMemc;
@@ -49,7 +61,7 @@ class WatchedItem {
 
        function removeWatch()
        {
-               $sql = "DELETE FROM watchlist WHERE wl_user=$this->id AND wl_namespace=$this->ns AND wl_title='$this->eti' LIMIT 1";
+               $sql = "DELETE FROM watchlist WHERE wl_user=$this->id AND wl_namespace=$this->ns AND wl_title='$this->eti'";
                $res = wfQuery( $sql, DB_WRITE );
                if( $res === false ) return false;
                
@@ -59,6 +71,7 @@ class WatchedItem {
        }
 
        /* static */ function duplicateEntries( $ot, $nt ) {
+               $fname = "WatchedItem::duplicateEntries";
                global $wgMemc, $wgDBname;
                $oldnamespace = $ot->getNamespace() & ~1;
                $newnamespace = $nt->getNamespace() & ~1;
@@ -68,7 +81,7 @@ class WatchedItem {
                $enewtitle = wfStrencode( $newtitle );
 
                $sql = "SELECT wl_user FROM watchlist
-                       WHERE wl_namespace={$oldnamespace} AND wl_title='{$oldtitle}'";
+                       WHERE wl_namespace={$oldnamespace} AND wl_title='{$eoldtitle}'";
                $res = wfQuery( $sql, DB_READ, $fname );
                if( $s = wfFetchObject( $res ) ) {
                        $sql = "REPLACE INTO watchlist (wl_user,wl_namespace,wl_title)