[geeklog-cvs] geeklog: It's 'polls', not 'poll' (since Geeklog 1.4.0) and shou...

[geeklog-cvs at lists.geeklog.net]

changeset 7471:60332a73eac2
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/60332a73eac2
user: Dirk Haun <dirk at haun-online.de>
date: Sat Nov 14 18:51:37 2009 +0100
description:
It's 'polls', not 'poll' (since Geeklog 1.4.0) and shouldn't really be referred to in non-plugin code

diffstat:

 system/lib-comment.php |  18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diffs (84 lines):

diff -r edafbd281458 -r 60332a73eac2 system/lib-comment.php
--- a/system/lib-comment.php	Sat Nov 14 15:51:17 2009 +0100
+++ b/system/lib-comment.php	Sat Nov 14 18:51:37 2009 +0100
@@ -205,7 +205,7 @@
 *
 * @param    array    &$comments Database result set of comments to be printed
 * @param    string   $mode      'flat', 'threaded', etc
-* @param    string   $type      Type of item (article, poll, etc.)
+* @param    string   $type      Type of item (article, polls, etc.)
 * @param    string   $order     How to order the comments 'ASC' or 'DESC'
 * @param    boolean  $delete_option   if current user can delete comments
 * @param    boolean  $preview   Preview display (for edit) or not
@@ -566,7 +566,7 @@
 *
 * @param    string      $sid       ID for item to show comments for
 * @param    string      $title     Title of item
-* @param    string      $type      Type of item (article, poll, etc.)
+* @param    string      $type      Type of item (article, polls, etc.)
 * @param    string      $order     How to order the comments 'ASC' or 'DESC'
 * @param    string      $mode      comment mode (nested, flat, etc.)
 * @param    int         $pid       id of parent comment
@@ -1229,7 +1229,7 @@
 * @param    $uid        int         user id
 * @param    $username   string      optional name of anonymous user
 * @param    $ipaddress  string      poster's IP address
-* @param    $type       string      type of comment ('article', 'poll', ...)
+* @param    $type       string      type of comment ('article', 'polls', ...)
 * @param    $cid        int         comment id (or 0 when in submission queue)
 * @return               boolean     true if successfully sent, otherwise false
 *
@@ -1270,7 +1270,7 @@
     $mailbody = "$LANG03[16]: $title\n"
               . "$LANG03[5]: $author\n";
 
-    if (($type != 'article') && ($type != 'poll')) {
+    if ($type != 'article') {
         $mailbody .= "$LANG09[5]: $type\n";
     }
 
@@ -1308,7 +1308,7 @@
  * for the specified $type and $sid.
  *
  * @author  Vincent Furia, vinny01 AT users DOT sourceforge DOT net
- * @param   string      $type   article, poll, or plugin identifier
+ * @param   string      $type   article, or plugin identifier
  * @param   string      $sid    id of object comment belongs to
  * @param   int         $cid    Comment ID
  * @return  string      0 indicates success, >0 identifies problem
@@ -1360,7 +1360,7 @@
 * Display form to report abusive comment.
 *
 * @param    string  $cid    comment id
-* @param    string  $type   type of comment ('article', 'poll', ...)
+* @param    string  $type   type of comment ('article', 'polls', ...)
 * @return   string          HTML for the form (or error message)
 *
 */
@@ -1439,7 +1439,7 @@
 * Send report about abusive comment
 *
 * @param    string  $cid    comment id
-* @param    string  $type   type of comment ('article', 'poll', ...)
+* @param    string  $type   type of comment ('article', 'polls', ...)
 * @return   string          Meta refresh or HTML for error message
 *
 */
@@ -1495,7 +1495,7 @@
               . "$LANG03[16]: $title\n"
               . "$LANG03[5]: $author\n";
 
-    if (($type != 'article') && ($type != 'poll')) {
+    if ($type != 'article') {
         $mailbody .= "$LANG09[5]: $type\n";
     }
 
@@ -1611,7 +1611,7 @@
  * @author Jared Wenerd, wenerd87 AT gmail DOT com
  * @param string  $comment  comment text
  * @param string  $postmode ('html', 'plaintext', ...)
- * @param string  $type     Type of item (article, poll, etc.)
+ * @param string  $type     Type of item (article, polls, etc.)
  * @param bool    $edit     if true append edit tag
  * @param int     $cid      commentid if editing comment (for proper sig)
  * @return string of comment text