[eGroupWare-svn] r24329 - in /branches/1.4/wiki: lib/url.php parse/macros.php

[<ral...@us...>]

Author: ralfbecker
Date: Sat Jul 21 08:11:23 2007
New Revision: 24329

URL: http://www.egroupware.org/viewvc?rev=3D3D24329&view=3D3Drev
Log:
fixed loosing page bug reported on the developer list, thanks to ian.miller=
=3D
-AT-ashmus.ox.ac.uk

Modified:
    branches/1.4/wiki/lib/url.php
    branches/1.4/wiki/parse/macros.php

Modified: branches/1.4/wiki/lib/url.php
URL: http://www.egroupware.org/viewvc/branches/1.4/wiki/lib/url.php?rev=3D3=
D2=3D
4329&r1=3D3D24328&r2=3D3D24329&view=3D3Ddiff
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D
--- branches/1.4/wiki/lib/url.php (original)
+++ branches/1.4/wiki/lib/url.php Sat Jul 21 08:11:23 2007
@@ -75,7 +75,7 @@
 		{
 			$lang =3D3D '&lang=3D3D' . ($lang ? $lang : $page['lang']);
 		}
-		return $HistoryBase . urlencode(is_array($page) ? $page['name'] : $page)=
=3D
 =2E $lang;
+		return $HistoryBase . urlencode(is_array($page) ? $page['name'] : $page)=
=3D
 =2E $lang .
 				($full =3D3D=3D3D '' ? '' : '&full=3D3D1');
 	}
 }

Modified: branches/1.4/wiki/parse/macros.php
URL: http://www.egroupware.org/viewvc/branches/1.4/wiki/parse/macros.php?re=
=3D
v=3D3D24329&r1=3D3D24328&r2=3D3D24329&view=3D3Ddiff
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D
--- branches/1.4/wiki/parse/macros.php (original)
+++ branches/1.4/wiki/parse/macros.php Sat Jul 21 08:11:23 2007
@@ -12,11 +12,11 @@
 	{
 		$list =3D3D $pagestore->allpages();
 	}
-	else if(strpos($args, '?') !=3D3D=3D3D false)           // New pages.
+	elseif(strpos($args, '?') !=3D3D=3D3D false)           // New pages.
 	{
 		$list =3D3D $pagestore->newpages();
 	}
-	else if(strpos($args, '~') !=3D3D=3D3D false)           // Zero-length (d=
elet=3D
ed) pages.
+	elseif(strpos($args, '~') !=3D3D=3D3D false)           // Zero-length (de=
lete=3D
d) pages.
 	{
 		$list =3D3D $pagestore->emptypages();
 	}
@@ -50,7 +50,8 @@
 =3D

 	if($i < count($list)-1)
 	{
-		$text .=3D3D html_fulllist(preg_match('/^[a-z]+$/i',$_GET['wikipage']) ?=
 $=3D
_GET['wikipage']:$page, count($list));
+		$pname =3D3D $_GET['wikipage'] ? $_GET['wikipage'] : $_GET['page'];
+		$text .=3D3D html_fulllist(preg_match('/^[a-z]+$/i',$pname) ? $pname : $=
pa=3D
ge, count($list));
 	}
 	return $text;
 }