Login | Register
My pages Projects Community openCollabNet

Discussions > cvs > CVS update: /cowiki/, /cowiki/htdocs/, /cowiki/includes/cowiki/class/util/

cowiki
Discussion topic

Back to topic list

CVS update: /cowiki/, /cowiki/htdocs/, /cowiki/includes/cowiki/class/util/

Author ytjohn
Full name John Hogenmiller
Date 2005-09-22 21:34:29 PDT
Message User: ytjohn
Date: 2005/09/22 21:34:29

Modified:
   cowiki/ChangeLog
   cowiki/htdocs/version.php
   cowiki/includes/cowi​ki/class/util/class.​HttpResponse.php

Log:
 Issue number: 243
 Fixed a small logical error that caused coWiki to return
 to incorrect directories after performing certain actions.
 

File Changes:

Directory: /cowiki/
===================

File [changed]: ChangeLog
Url: http://cowiki.tigris​.org/source/browse/c​owiki/ChangeLog?r1=1​.117&r2=1.118
Delta lines: +4 -1
-------------------
--- ChangeLog 12 Sep 2005 20:09:50 -0000 1.117
+++ ChangeLog 23 Sep 2005 04:34:25 -0000 1.118
@@ -1,11 +1,14 @@
 #
 # coWiki change log
 #
-# $Id: ChangeLog,v 1.117 2005/09/12 20:09:50 dgorski Exp $
+# $Id: ChangeLog,v 1.118 2005/09/23 04:34:25 ytjohn Exp $
 #
 
 Version 0.4.0 (Fullerene) YET UNRELEASED
 --------------------​--------------------​--------------------​---------------
+* 2005-09-23 - Fixed issue #243: When using subdirectories instead of root
+ ('/'), certain actions like Change user and Preferences fail
+ return to an appropriate url. (ytjohn)
 * 2005-09-12 - Honour the configuration [RUNTIME] RSS_FEED_RECENT setting
                while saving a document. (dtg)
 * 2005-09-03 - Added buildinterim.sh and patch files to facilitate

Directory: /cowiki/htdocs/
==========================

File [changed]: version.php
Url: http://cowiki.tigris​.org/source/browse/c​owiki/htdocs/version​.php?r1=1.153&r2​=1.154
Delta lines: +3 -3
-------------------
--- version.php 22 Sep 2005 03:06:46 -0000 1.153
+++ version.php 23 Sep 2005 04:34:25 -0000 1.154
@@ -2,7 +2,7 @@
 
 /**
  *
- * $Id: version.php,v 1.153 2005/09/22 03:06:46 dgorski Exp $
+ * $Id: version.php,v 1.154 2005/09/23 04:34:25 ytjohn Exp $
  *
  * This file is part of coWiki. coWiki is free software under the terms of
  * the GNU General Public License (GPL). Read the LICENSE file. If you did
@@ -16,7 +16,7 @@
  * @author Daniel T. Gorski, <daniel.gorski@de​velnet.org>
  * @copyright (C) Daniel T. Gorski, {@link http://www.develnet.org}
  * @license http://www.gnu.org/l​icenses/gpl.html
- * @version $Revision: 1.153 $
+ * @version $Revision: 1.154 $
  *
  */
 
@@ -99,7 +99,7 @@
      * ease the work of the developers. Please do not forget to add your
      * changes to the ChangeLog file too.
      */
- define('COWIKI_VERSION_DATE', 'September 22 2005');
+ define('COWIKI_VERSION_DATE', 'September 23 2005');
     
 
 

Directory: /cowiki/includes/cow​iki/class/util/
====================​====================​======

File [changed]: class.HttpResponse.php
Url: http://cowiki.tigris​.org/source/browse/c​owiki/includes/cowik​i/class/util/class.H​ttpResponse.php?r1=1​.22&r2=1.23
Delta lines: +6 -8
-------------------
--- class.HttpResponse.php 17 Apr 2005 04:30:08 -0000 1.22
+++ class.HttpResponse.php 23 Sep 2005 04:34:25 -0000 1.23
@@ -2,7 +2,7 @@
 
 /**
  *
- * $Id: class.HttpResponse.php,v 1.22 2005/04/17 04:30:08 dgorski Exp $
+ * $Id: class.HttpResponse.php,v 1.23 2005/09/23 04:34:25 ytjohn Exp $
  *
  * This file is part of coWiki. coWiki is free software under the terms of
  * the GNU General Public License (GPL). Read the LICENSE file. If you did
@@ -17,7 +17,7 @@
  * @author Daniel T. Gorski, <daniel.gorski@de​velnet.org>
  * @copyright (C) Daniel T. Gorski, {@link http://www.develnet.org}
  * @license http://www.gnu.org/l​icenses/gpl.html
- * @version $Revision: 1.22 $
+ * @version $Revision: 1.23 $
  *
  */
 
@@ -351,7 +351,8 @@
         $sPath = str_replace('&am​p;','&',$this-​>getControllerPath​($sQuery));
 
         header('Location: '
- . $this->Request-​>getBaseUri()
+ . $this->Request-​>getHostUri()
+ . '/'
                . $sPath);
         exit;
     }
@@ -383,11 +384,8 @@
         $sInfo = str_replace('&amp;', '&', $sPath);
         $sInfo = str_replace('//', '/', $sInfo);
         $sInfo = str_replace('\\\\', '\\', $sInfo);
- if ($sInfo{0} == '/' || $sInfo{0} == '\\') {
- $sInfo = substr($sInfo, 1);
- }
 
- header('Location: ' . $this->Request-​>getBaseUri() . $sInfo);
+ header('Location: ' . $this->Request-​>getHostUri() . $sInfo);
         exit;
     }

« Previous message in topic | 1 of 1 | Next message in topic »

Messages

Show all messages in topic

CVS update: /cowiki/, /cowiki/htdocs/, /cowiki/includes/cowiki/class/util/ ytjohn John Hogenmiller 2005-09-22 21:34:29 PDT
Messages per page: