[php-blog-cvs] jBlog jBlog_functions.inc.php,1.47,1.48

[<gsc...@us...>]

Update of /cvsroot/php-blog/jBlog
In directory sc8-pr-cvs1:/tmp/cvs-serv2503

Modified Files:
	jBlog_functions.inc.php 
Log Message:
~ expansion breaks UserDir urls
fixed issue with relative local urls in auto_discovery

VS: ----------------------------------------------------------------------


Index: jBlog_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_functions.inc.php,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- jBlog_functions.inc.php	10 Mar 2003 22:33:13 -0000	1.47
+++ jBlog_functions.inc.php	11 Mar 2003 01:35:23 -0000	1.48
@@ -191,7 +191,6 @@
 
     $query = "SELECT * FROM {$jBlog['dbPrefix']}entries e, {$jBlog['dbPrefix']}authors a WHERE e.authorid = a.authorid " . $and .
              "ORDER BY timestamp DESC $limit";
-
     $cursor = mysql_db_query($jBlog["dbName"], $query);
     if (!$cursor) {
         die("Query failed: " . mysql_error() . "\n");
@@ -510,9 +509,9 @@
     $ret = str_replace(chr(1),'\*',$ret);
 
     // italics
-    $ret = str_replace('\~',chr(1),$ret);
-    $ret = preg_replace('/~([\S ]+?)~/','<i>\1</i>',$ret);
-    $ret = str_replace(chr(1),'\~',$ret);
+//    $ret = str_replace('\~',chr(1),$ret);
+//    $ret = preg_replace('/~([\S ]+?)~/','<i>\1</i>',$ret);
+//    $ret = str_replace(chr(1),'\~',$ret);
 
     // monospace font
     $ret = str_replace('\%',chr(1),$ret);
@@ -778,6 +777,9 @@
     $tmpid = mysql_escape_string($id);
 
     for ($i = 0, $j = count($locations); $i < $j; ++$i) {
+        if($locations[$i][0] == '/') {
+            $locations[$i] = "http://".$_SERVER['HTTP_HOST'].$locations[$i];
+        }
         $query = "SELECT COUNT(id) FROM {$jBlog['dbPrefix']}references WHERE ";
         $query .= "entry_id=$tmpid AND link='" . mysql_escape_string($locations[$i]) . "'";