phpwiki-checkins Mailing List for PhpWiki

Update of /cvsroot/phpwiki/phpwiki/lib/plugin
In directory sc8-pr-cvs1:/tmp/cvs-serv3185/lib/plugin
Modified Files:
	RecentChanges.php 
Log Message:
Bug fix: "add sidebar" link didn't work when USE_PATH_INFO was false.
Index: RecentChanges.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/RecentChanges.php,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -2 -b -p -d -r1.78 -r1.79
--- RecentChanges.php	4 Mar 2003 01:55:05 -0000	1.78
+++ RecentChanges.php	29 Apr 2003 14:34:20 -0000	1.79
@@ -264,5 +264,5 @@ extends _RecentChanges_Formatter
 
 global $request;
- $sidebarurl = WikiURL($pagetitle, false, 'absurl') . "?format=sidebar";
+ $sidebarurl = WikiURL($pagetitle, array('format' => 'sidebar'), 'absurl');
 
 $addsidebarjsfunc =
@@ -771,4 +771,7 @@ class DayButtonBar extends HtmlElement {
 
 // $Log$
+// Revision 1.79 2003年04月29日 14:34:20 dairiki
+// Bug fix: "add sidebar" link didn't work when USE_PATH_INFO was false.
+//
 // Revision 1.78 2003年03月04日 01:55:05 dairiki
 // Fix to ensure absolute URL for logo in RSS recent changes.

Update of /cvsroot/phpwiki/phpwiki/themes/Portland
In directory sc8-pr-cvs1:/tmp/cvs-serv9556/Portland
Modified Files:
	portland.css 
Log Message:
Fix CSS list vertical spacing.
Index: portland.css
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/themes/Portland/portland.css,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -2 -b -p -d -r1.11 -r1.12
--- portland.css	27 Feb 2003 23:55:51 -0000	1.11
+++ portland.css	1 Apr 2003 17:55:18 -0000	1.12
@@ -28,4 +28,79 @@ input.numeric {
 }
 
+/*
+ * Vertical margins around block elements.
+ */
+
+p { margin: 1em 0; }		/* Normal ("loose") paragraphs */
+li p, dd p, td p { margin: 1ex 0; } /* Paragraphs within lists are a little tighter. */
+ 
+/* ul, ol, dl { margin: 0.2ex 0; }	/* A little room around lists. */
+/* li ul, li ol, li dl,
+dd ul, dd ol, dd dl { margin: 0 0; } /* but not around sub-lists. */
+
+/* Normal ("loose") list elements */
+li.tightenable { margin: 1em 0; }
+dt.tightenable { margin-top: 1em; }
+dd.tightenable { margin-bottom: 1.5ex; }
+
+ 
+li.tightenable.top,
+dt.tightenable.top,
+dd.tightenable.top {
+ margin-top: 0.2ex;
+}
+li li.tightenable.top {
+ margin-top: 0;
+}
+li.tightenable.bottom,
+dd.tightenable.bottom {
+ margin-bottom: 0.2ex;
+}
+li li.tightenable.bottom {
+ margin-bottom: 0;
+}
+
+.tightenable.top {
+ margin-top: 0;
+}
+.tightenable.bottom {
+ margin-bottom: 0;
+}
+
+/*
+ * "DL tables"
+ */
+.wiki-dl-table {
+ border-collapse: collapse;
+ border: 2px #444 solid;
+}
+.wiki-dl-table tr {
+ border-top: 2px #444 solid;
+ border-bottom: 2px #444 solid;
+ border-left: none; 
+ border-right: none; 
+}
+.wiki-dl-table tr.tightenable.top {
+ border-top: 1px #444 solid;
+}
+.wiki-dl-table tr.tightenable.bottom {
+ border-bottom: 1px #444 solid;
+}
+.wiki-dl-table th,
+.wiki-dl-table td {
+ padding: 0.25em 0.5em;
+}
+.wiki-dl-table th {
+ vertical-align: top;
+ text-align: right;
+ border-right: 1px #444 solid;
+ border-left: none;
+ border-top: none;
+ border-bottom: none;
+}
+.wiki-dl-table td {
+ border: none;
+}
+
 /* Mozilla RecentChanges Sidebar */
 body.sidebar {

Update of /cvsroot/phpwiki/phpwiki/lib
In directory sc8-pr-cvs1:/tmp/cvs-serv25410/lib
Modified Files:
	XmlElement.php 
Log Message:
Convert " to " in XML output.
(Problem pointed out by Martin Geisler.)
Index: XmlElement.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/XmlElement.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -2 -b -p -d -r1.22 -r1.23
--- XmlElement.php	10 Mar 2003 19:51:03 -0000	1.22
+++ XmlElement.php	1 Apr 2003 17:20:16 -0000	1.23
@@ -143,7 +143,5 @@ class XmlContent
 
 function _quote ($string) {
- return str_replace('<', '&lt;',
- str_replace('>', '&gt;',
- str_replace('&', '&amp;', $string)));
+ return htmlspecialchars($string);
 }
 };