[geeklog-cvs] geeklog-1.3/public_html lib-common.php,1.219,1.220

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

Update of /usr/cvs/geeklog/geeklog-1.3/public_html
In directory internal.geeklog.net:/tmp/cvs-serv21919

Modified Files:
	lib-common.php 
Log Message:
Picked up Vincent Furia's improvements for COM_article().


Index: lib-common.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/lib-common.php,v
retrieving revision 1.219
retrieving revision 1.220
diff -C2 -d -r1.219 -r1.220
*** lib-common.php	5 May 2003 16:52:35 -0000	1.219
--- lib-common.php	6 May 2003 13:56:20 -0000	1.220
***************
*** 352,361 ****
      if( $_CONF['contributedbyline'] == 1 )
      {
          $article->set_var( 'lang_contributed_by', $LANG01[1] );
          $article->set_var( 'contributedby_uid', $A['uid'] );
!         $username = DB_getItem( $_TABLES['users'],'username',"uid = '{$A['uid']}'" );
          $article->set_var( 'contributedby_user', $username );
  
!         $fullname = DB_getItem( $_TABLES['users'],'fullname',"uid = '{$A['uid']}'" );
          if( empty( $fullname ))
          {
--- 352,365 ----
      if( $_CONF['contributedbyline'] == 1 )
      {
+         $sql = "SELECT username, fullname, photo FROM {$_TABLES['users']} WHERE uid = '{$A['uid']}'";
+         $results = DB_query( $sql );
+         $U = DB_fetchArray( $results );
+ 
          $article->set_var( 'lang_contributed_by', $LANG01[1] );
          $article->set_var( 'contributedby_uid', $A['uid'] );
!         $username = $U['username'];
          $article->set_var( 'contributedby_user', $username );
  
!         $fullname = $U['fullname'];
          if( empty( $fullname ))
          {
***************
*** 369,379 ****
          if( $A['uid'] > 1 )
          {
!             $article->set_var( 'start_contributedby_anchortag', '<a class="storybyline" href="' . $_CONF['site_url'] . '/users.php?mode=profile&uid=' . $A['uid'] . '">' );
              $article->set_var( 'end_contributedby_anchortag', '</a>' );
              $article->set_var( 'contributedby_url', $_CONF['site_url']
                      . '/users.php?mode=profile&uid=' . $A['uid'] );
  
!             $photo = DB_getItem( $_TABLES['users'], 'photo',
!                     "uid = {$A['uid']}" );
              if( !empty( $photo ))
              {
--- 373,384 ----
          if( $A['uid'] > 1 )
          {
!             $article->set_var( 'start_contributedby_anchortag',
!                     '<a class="storybyline" href="' . $_CONF['site_url']
!                     . '/users.php?mode=profile&uid=' . $A['uid'] . '">' );
              $article->set_var( 'end_contributedby_anchortag', '</a>' );
              $article->set_var( 'contributedby_url', $_CONF['site_url']
                      . '/users.php?mode=profile&uid=' . $A['uid'] );
  
!             $photo = $U['photo'];
              if( !empty( $photo ))
              {