Merge remote branch 'origin/platal-1.0.1'

[platal.git] / include / newsletter.inc.php

diff --git a/include/newsletter.inc.php b/include/newsletter.inc.php
index fbefc9f..86ce712 100644 (file)
--- a/include/newsletter.inc.php
+++ b/include/newsletter.inc.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2009 Polytechnique.org                              *
+ *  Copyright (C) 2003-2010 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -92,6 +92,7 @@ class NewsLetter extends MassMailer
 
     public function saveArticle(&$a)
     {
+        $a->_cid = ($a->_cid == 0) ? null : $a->_cid;
         if ($a->_aid >= 0) {
             XDB::execute('REPLACE INTO  newsletter_art (id, aid, cid, pos, title, body, append)
                                 VALUES  ({?}, {?}, {?}, {?}, {?}, {?}, {?})',
@@ -133,7 +134,7 @@ class NewsLetter extends MassMailer
         $user = is_null($uid) ? S::v('uid') : $uid;
         $res = XDB::query("SELECT  1
                              FROM  newsletter_ins
-                            WHERE  user_id={?}", $user);
+                            WHERE  uid={?}", $user);
         return $res->fetchOneCell();
     }
 
@@ -141,14 +142,14 @@ class NewsLetter extends MassMailer
     {
         $user = is_null($uid) ? S::v('uid') : $uid;
         XDB::execute("DELETE FROM  newsletter_ins
-                            WHERE  user_id={?}", $user);
+                            WHERE  uid={?}", $user);
     }
 
     static public function subscribe($uid = null)
     {
         $user = is_null($uid) ? S::v('uid') : $uid;
-        XDB::execute("REPLACE INTO  newsletter_ins (user_id,last)
-                            VALUES  ({?}, 0)", $user);
+        XDB::execute("REPLACE INTO  newsletter_ins (uid,last)
+                            VALUES  ({?}, NULL)", $user);
     }
 
     protected function subscriptionWhere()