[geeklog-cvs] geeklog-1.3/public_html lib-common.php,1.347,1.348

[dhaun at iowaoutdoors.org]

Update of /var/cvs/geeklog-1.3/public_html
In directory www:/tmp/cvs-serv30802/public_html

Modified Files:
	lib-common.php 
Log Message:
& -> & and some source code cosmetics


Index: lib-common.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/public_html/lib-common.php,v
retrieving revision 1.347
retrieving revision 1.348
diff -C2 -d -r1.347 -r1.348
*** lib-common.php	31 Jul 2004 03:30:35 -0000	1.347
--- lib-common.php	1 Aug 2004 09:27:26 -0000	1.348
***************
*** 562,565 ****
--- 562,567 ----
                  . '" title="' . $LANG11[2] . '" border="0"></a>' );
          }
+         $printUrl = COM_buildUrl( $_CONF['site_url'] . '/article.php?story='
+                                   . $A['sid'] . '&mode=print' );
          if( $_CONF['hideprintericon'] == 1 )
          {
***************
*** 568,573 ****
          else
          {
-             $printUrl = COM_buildUrl( $_CONF['site_url'] . '/article.php?story='
-                                       . $A['sid'] . '&mode=print' );
              $article->set_var( 'print_icon', '<a href="' . $printUrl . '">'
                  . '<img border="0" src="' . $_CONF['layout_url']
--- 570,573 ----
***************
*** 575,585 ****
                  . $LANG11[3] . '"></a>' );
          }
!         if ($_CONF['pdf_enabled'] == 1) {
!             $article->set_var('pdf_icon',
!                 sprintf('<a href="%s/pdfgenerator.php?pageType=2&pageData=%s"><img border="0" src="%s/images/pdf.gif" alt="%s" title="%s" /></a>',
!                     $_CONF['site_url'], urlencode("{$_CONF['site_url']}/article.php?story={$A['sid']}&mode=print"),
!                     $_CONF['layout_url'], $LANG01[111], $LANG11[5]));
!         } else {
!             $article->set_var('pdf_icon', '');
          }
      }
--- 575,588 ----
                  . $LANG11[3] . '"></a>' );
          }
!         if( $_CONF['pdf_enabled'] == 1 )
!         {
!             $article->set_var( 'pdf_icon',
!                 sprintf( '<a href="%s/pdfgenerator.php?pageType=2&pageData=%s"><img border="0" src="%s/images/pdf.gif" alt="%s" title="%s"></a>',
!                     $_CONF['site_url'], urlencode( $printUrl ),
!                     $_CONF['layout_url'], $LANG01[111], $LANG11[5] ));
!         }
!         else
!         {
!             $article->set_var( 'pdf_icon', '' );
          }
      }