[php-blog-cvs] serendipity serendipity_functions.inc.php,1.95,1.96

[<tom...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv32443

Modified Files:
	serendipity_functions.inc.php 
Log Message:
I am really sorry, it seems CVS committed r1.94 without neither notifying us or me.
I tried to commit my lastest change (see r1.95), but got up2date errors and so it seems CVS might have screwed some things up there
I blame sourceforge :)

I hope I did not mess anything up with the new coding styles, please check :/

Sorry again


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -d -r1.95 -r1.96
--- serendipity_functions.inc.php	7 Jul 2003 21:32:52 -0000	1.95
+++ serendipity_functions.inc.php	7 Jul 2003 23:58:05 -0000	1.96
@@ -872,42 +872,8 @@
 function serendipity_markup_text($str, $entry_id = 0) {
     global $serendipity;
 
-  $ret = $str;
-
-<<<<<<< serendipity_functions.inc.php
-  $ret = str_replace('\_', chr(1), $ret);
-  $ret = preg_replace('/#([[:alnum:]]+?)#/','&\1;',$ret);
-  $ret = preg_replace('/\b_([\S ]+?)_\b/','<u>\1</u>',$ret);
-  $ret = str_replace(chr(1), '\_', $ret);
-
-  //bold
-  $ret = str_replace('\*',chr(1),$ret);
-  $ret = str_replace('**',chr(2),$ret);
-  $ret = preg_replace('/(\S)\*(\S)/','\1' . chr(1) . '\2',$ret);
-  $ret = preg_replace('/\B\*([^*]+)\*\B/','<strong>\1</strong>',$ret);
-  $ret = str_replace(chr(2),'**',$ret);
-  $ret = str_replace(chr(1),'\*',$ret);
-
-  // monospace font
-  $ret = str_replace('\%',chr(1),$ret);
-  $ret = preg_replace_callback('/%([\S ]+?)%/', 'serendipity_format_tt', $ret);
-  $ret = str_replace(chr(1),'%',$ret);
-
-  $ret = preg_replace('/\|([0-9a-fA-F]+?)\|([\S ]+?)\|/','<font color="\1">\2</font>',$ret);
-  $ret = preg_replace('/\^([[:alnum:]]+?)\^/','<sup>\1</sup>',$ret);
-  $ret = preg_replace('/\@([[:alnum:]]+?)\@/','<sub>\1</sub>',$ret);
-  $ret = preg_replace('/([\\\])([*#_|^@%])/', '\2', $ret);
-
-  if ($serendipity['track_exits']) {
-    $serendipity['encodeExitsCallback_entry_id'] = $entry_id;
+    $ret = $str;
 
-    $ret = preg_replace_callback(
-      "#<a href=(\"|')http://([^\"']+)(\"|')#im",
-      'serendipity_encodeExitsCallback',
-      $ret
-    );
-  }
-=======
     $ret = str_replace('\_', chr(1), $ret);
     $ret = preg_replace('/#([[:alnum:]]+?)#/','&\1;',$ret);
     $ret = preg_replace('/\b_([\S ]+?)_\b/','<u>\1</u>',$ret);
@@ -945,9 +911,8 @@
           $ret
         );
     }
->>>>>>> 1.93
 
-  return $ret;
+    return $ret;
 }
 
 /**
@@ -1952,5 +1917,4 @@
 }
 
 define("serendipity_FUNCTIONS_LOADED", true);
-/* vim: set sts=4 ts=4 expandtab : */
 ?>