Add wfErrorLog() call before throwing an exception in readStyleFile

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

diff --git a/includes/WatchedItem.php b/includes/WatchedItem.php
index cb27312..932af16 100644 (file)
--- a/includes/WatchedItem.php
+++ b/includes/WatchedItem.php
@@ -27,7 +27,7 @@
  * @ingroup Watchlist
  */
 class WatchedItem {
-       var $mTitle, $mUser, $id, $gr, $ns, $ti;
+       var $mTitle, $mUser, $id, $ns, $ti;
        private $loaded = false, $watched, $timestamp;
 
        /**
@@ -36,7 +36,7 @@ class WatchedItem {
         * @param $title Title: the title we're going to (un)watch
         * @return WatchedItem object
         */
-       public static function fromUserTitle( $user, $title, $group = 0 ) {
+       public static function fromUserTitle( $user, $title ) {
                $wl = new WatchedItem;
                $wl->mUser = $user;
                $wl->mTitle = $title;
@@ -48,8 +48,6 @@ class WatchedItem {
                $wl->ns = $title->getNamespace();
 
                $wl->ti = $title->getDBkey();
-
-               $wl->gr = $group;
                return $wl;
        }
 
@@ -147,7 +145,6 @@ class WatchedItem {
                $dbw->insert( 'watchlist',
                  array(
                        'wl_user' => $this->id,
-                       'wl_group' => $this->gr,
                        'wl_namespace' => MWNamespace::getSubject($this->ns),
                        'wl_title' => $this->ti,
                        'wl_notificationtimestamp' => null
@@ -158,7 +155,6 @@ class WatchedItem {
                $dbw->insert( 'watchlist',
                  array(
                        'wl_user' => $this->id,
-                       'wl_group' => $this->gr,
                        'wl_namespace' => MWNamespace::getTalk($this->ns),
                        'wl_title' => $this->ti,
                        'wl_notificationtimestamp' => null