[geeklog-cvs] geeklog-1.3/public_html lib-common.php,1.260,1.261

[geeklog-cvs-admin at lists.geeklog.net]

Update of /usr/cvs/geeklog/geeklog-1.3/public_html
In directory geeklog_prod:/tmp/cvs-serv21481/public_html

Modified Files:
	lib-common.php 
Log Message:
Forgot to handle comments in polls ...


Index: lib-common.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/lib-common.php,v
retrieving revision 1.260
retrieving revision 1.261
diff -C2 -d -r1.260 -r1.261
*** lib-common.php	14 Sep 2003 09:07:54 -0000	1.260
--- lib-common.php	14 Sep 2003 09:18:04 -0000	1.261
***************
*** 1767,1771 ****
              if( $scale > 399 && $Q['commentcode'] >= 0 )
              {
!                 $retval .= COM_userComments( $qid, $Q['question'], 'poll', $order, $mode );
              }
          }
--- 1767,1775 ----
              if( $scale > 399 && $Q['commentcode'] >= 0 )
              {
!                 $delete_option = ( SEC_hasAccess( $Q['owner_id'],
!                     $Q['group_id'], $Q['perm_owner'], $Q['perm_group'],
!                     $Q['perm_members'], $Q['perm_anon'] ) == 3 ? true : false );
!                 $retval .= COM_userComments( $qid, $Q['question'], 'poll',
!                                              $order, $mode, $delete_option ); 
              }
          }
***************
*** 2612,2621 ****
      $template->set_var( 'type', $A['type'] );
  
!     if( $preview )
!     {
!         $template->set_var( 'delete_option', '' );
!     }
!     // NOTE: the following check is nonsense (but fully 1.3.8 compatible ;-)
!     else if( $delete_option )
      {
          $template->set_var( 'delete_option', '| <a href="' . $_CONF['site_url']
--- 2616,2620 ----
      $template->set_var( 'type', $A['type'] );
  
!     if( $delete_option )
      {
          $template->set_var( 'delete_option', '| <a href="' . $_CONF['site_url']
***************
*** 2623,2626 ****
--- 2622,2629 ----
                  . '&sid=' . $A['sid'] . '&type=' . $type . '">'
                  . $LANG01[28] . '</a> ' );
+     }
+     else
+     {
+         $template->set_var( 'delete_option', '' );
      }