[geeklog-cvs] Geeklog-1.x/system lib-story.php,1.115,1.116

[Dirk Haun]

Update of /cvsroot/geeklog/Geeklog-1.x/system
In directory qs1489.pair.com:/tmp/cvs-serv76893/system

Modified Files:
	lib-story.php 
Log Message:
Fixed regression: {contributedby_photo} didn't work any more. Also made it available as {author_photo} now, for consistency with the comment templates.


Index: lib-story.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/lib-story.php,v
retrieving revision 1.115
retrieving revision 1.116
diff -C2 -d -r1.115 -r1.116
*** lib-story.php	9 Dec 2007 17:21:31 -0000	1.115
--- lib-story.php	22 Dec 2007 14:38:29 -0000	1.116
***************
*** 130,149 ****
          }
          $article->set_var( 'contributedby_author', $authorname );
          $photo = '';
!         if( $_CONF['allow_user_photo'] )
!         {
!             $photo = USER_getPhoto( $story->DisplayElements('uid'), $story->DisplayElements('photo') );
          }
!         if( !empty( $photo ))
!         {
!             $article->set_var( 'contributedby_photo', $photo );
              $camera_icon = '<img src="' . $_CONF['layout_url']
!                 .'/images/smallcamera.' . $_IMAGE_TYPE . '" alt=""' . XHTML . '>';
!             $article->set_var( 'camera_icon', COM_createLink($camera_icon, $profileUrl));
!         }
!         else
!         {
!             $article->set_var( 'contributedby_photo', '' );
!             $article->set_var( 'camera_icon', '' );
          }
      }
--- 130,155 ----
          }
          $article->set_var( 'contributedby_author', $authorname );
+ 
          $photo = '';
!         if ($_CONF['allow_user_photo'] == 1) {
!             $authphoto = $story->DisplayElements('photo');
!             if (empty($authphoto)) {
!                 $authphoto = '(none)'; // user does not have a photo
!             }
!             $photo = USER_getPhoto($story->DisplayElements('uid'), $authphoto,
!                                    $story->DisplayElements('email'));
          }
!         if (!empty($photo)) {
!             $article->set_var('contributedby_photo', $photo);
!             $article->set_var('author_photo', $photo);
              $camera_icon = '<img src="' . $_CONF['layout_url']
!                          . '/images/smallcamera.' . $_IMAGE_TYPE . '" alt=""'
!                          . XHTML . '>';
!             $article->set_var('camera_icon',
!                               COM_createLink($camera_icon, $profileUrl));
!         } else {
!             $article->set_var ('contributedby_photo', '');
!             $article->set_var ('author_photo', '');
!             $article->set_var ('camera_icon', '');
          }
      }