[php-blog-cvs] serendipity NEWS,1.103.4.3,1.103.4.4 comment.php,1.30.4.2,1.30.4.3 serendipity_config.inc.php,1.63.2.4,1.63.2.5 serendipity_functions.inc.php,1.248.4.8,1.248.4.9

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3200

Modified Files:
      Tag: branch_0_6
	NEWS comment.php serendipity_config.inc.php 
	serendipity_functions.inc.php 
Log Message:
Seems we need to prepare for a -pl1 release.
MFH.


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.103.4.3
retrieving revision 1.103.4.4
diff -u -d -r1.103.4.3 -r1.103.4.4
--- NEWS	12 May 2004 14:50:35 -0000	1.103.4.3
+++ NEWS	14 May 2004 08:29:58 -0000	1.103.4.4
@@ -1,5 +1,12 @@
 # $Id$
 
+Version 0.6-pl1 ()
+------------------------------------------------------------------------
+
+    * Fixed trackbacks not associated to the right entry id (garvinhicking)
+
+    * Fixed typo in Creative Common Plugin (Jonathan Arkell)
+
 Version 0.6 (May 12h, 2004)
 ------------------------------------------------------------------------
 

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.248.4.8
retrieving revision 1.248.4.9
diff -u -d -r1.248.4.8 -r1.248.4.9
--- serendipity_functions.inc.php	6 May 2004 10:39:59 -0000	1.248.4.8
+++ serendipity_functions.inc.php	14 May 2004 08:29:59 -0000	1.248.4.9
@@ -1627,7 +1627,7 @@
 function serendipity_trackback_is_success($resp)
 {
     if (preg_match('@<error>(\d)+</error>@', $resp, $matches)) {
-        if ((int) $matches[1]) {
+        if ((int) $matches[1] || (string) $matches[1] === "0") {
             return 1;
         } else {
             if (preg_match('@<message>([^<]+)</message>@', $resp, $matches)) {
@@ -1676,7 +1676,7 @@
     global $serendipity;
     $target = parse_url($loc);
     if ($target['query'] != '') {
-        $target['query'] = '?' . $target['query'];
+        $target['query'] = '?' . str_replace('&amp;', '&', $target['query']);
     }
 
     if (!is_numeric($target['port'])) {

Index: comment.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/comment.php,v
retrieving revision 1.30.4.2
retrieving revision 1.30.4.3
diff -u -d -r1.30.4.2 -r1.30.4.3
--- comment.php	13 Apr 2004 11:09:39 -0000	1.30.4.2
+++ comment.php	14 May 2004 08:29:58 -0000	1.30.4.3
@@ -24,7 +24,7 @@
     $uri = $_SERVER['REQUEST_URI'];
     if (isset($_REQUEST['entry_id'])) {
         $id = $_REQUEST['entry_id'];
-    } else if (preg_match('@\/(\d+)$@', $uri, $matches)) {
+    } else if (preg_match('@/(\d+)_[^/]*$@', $uri, $matches)) {
         $id = $matches[1];
     }
 

Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.63.2.4
retrieving revision 1.63.2.5
diff -u -d -r1.63.2.4 -r1.63.2.5
--- serendipity_config.inc.php	3 May 2004 08:01:31 -0000	1.63.2.4
+++ serendipity_config.inc.php	14 May 2004 08:29:58 -0000	1.63.2.5
@@ -15,7 +15,7 @@
 include_once(S9Y_INCLUDE_PATH . 'compat.php');
 ini_set('session.use_trans_sid', 0);
 
-$serendipity['version']      = '0.6';
+$serendipity['version']      = '0.6-pl1';
 $serendipity['production']   = 1;
 $serendipity['rewrite']      = 'none';
 $serendipity['messagestack'] = array();