[geeklog-cvs] geeklog-1.3/public_html lib-common.php,1.335,1.336

[dhaun at iowaoutdoors.org]

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

Modified Files:
	lib-common.php 
Log Message:
Prevent COM_makeClickableLinks from picking up URLs to images in stories that are posted as plain text but use Geeklog's image upload.


Index: lib-common.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/public_html/lib-common.php,v
retrieving revision 1.335
retrieving revision 1.336
diff -C2 -d -r1.335 -r1.336
*** lib-common.php	8 Jul 2004 19:38:11 -0000	1.335
--- lib-common.php	8 Jul 2004 20:11:32 -0000	1.336
***************
*** 5637,5641 ****
  function COM_makeClickableLinks( $text )
  {
!     $text = preg_replace( '/((((ht|f)tps?):(\/\/)|www)[a-z0-9%&_\-\+,;=:@~#\/.\?\[\]]+(\/|[+0-9a-z]))/is', '<a href="\\1">\\1</a>', $text );
      $text = str_replace( '<a href="www', '<a href="http://www', $text );
  
--- 5637,5641 ----
  function COM_makeClickableLinks( $text )
  {
!     $text = preg_replace( '/([^"])((((ht|f)tps?):(\/\/)|www)[a-z0-9%&_\-\+,;=:@~#\/.\?\[\]]+(\/|[+0-9a-z]))/is', '\\1<a href="\\2">\\2</a>', $text );
      $text = str_replace( '<a href="www', '<a href="http://www', $text );