Thread: [phpwiki-checkins] CVS: phpwiki/lib/plugin Calendar.php,1.23,1.24 EditMetaData.php,1.1,1.2 OldStyleT

Update of /cvsroot/phpwiki/phpwiki/lib/plugin
In directory usw-pr-cvs1:/tmp/cvs-serv7498/plugin
Modified Files:
	Calendar.php EditMetaData.php OldStyleTable.php RawHtml.php 
	_BackendInfo.php 
Log Message:
Replaced NBSP constant with a new nbsp() function. The return value of HTML::nbsp() depends on the CHARSET in index.php. It provides the utf-8 and iso-8859-1 non-breaking spaces, and for any other charset it falls back to the html-entity " ". (Maybe this should just always output an html entity? We currently use a raw "\xA0" character for iso-8859-1 so this value was left as is.)
Index: Calendar.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/Calendar.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -2 -b -p -d -r1.23 -r1.24
--- Calendar.php	17 Aug 2002 15:52:51 -0000	1.23
+++ Calendar.php	29 Oct 2002 01:12:24 -0000	1.24
@@ -126,5 +126,5 @@ extends WikiPlugin
 $mday);
 }
- $td->pushContent(NBSP, $date, NBSP);
+ $td->pushContent(HTML::nbsp(), $date, HTML::nbsp());
 return $td;
 }
Index: EditMetaData.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/EditMetaData.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -2 -b -p -d -r1.1 -r1.2
--- EditMetaData.php	27 Sep 2002 10:55:45 -0000	1.1
+++ EditMetaData.php	29 Oct 2002 01:12:24 -0000	1.2
@@ -123,5 +123,5 @@ extends WikiPlugin
 $hiddenfield,
 $instructions, HTML::br(),
- $keyfield, ' => ', $valfield, NBSP, $button
+ $keyfield, ' => ', $valfield, HTML::nbsp(), $button
 );
 
Index: OldStyleTable.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/OldStyleTable.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -2 -b -p -d -r1.2 -r1.3
--- OldStyleTable.php	17 Sep 2002 19:19:53 -0000	1.2
+++ OldStyleTable.php	29 Oct 2002 01:12:24 -0000	1.3
@@ -62,5 +62,4 @@ extends WikiPlugin
 $line, $matches, PREG_SET_ORDER);
 
- $NBSP = new RawXml(' ');
 $row = HTML::tr();
 
@@ -84,5 +83,5 @@ extends WikiPlugin
 
 $row->pushContent(HTML::td($attr,
- $NBSP, $content, $NBSP));
+ HTML::nbsp(), $content, HTML::nbsp()));
 }
 return $row;
Index: RawHtml.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/RawHtml.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -2 -b -p -d -r1.2 -r1.3
--- RawHtml.php	22 Aug 2002 23:28:31 -0000	1.2
+++ RawHtml.php	29 Oct 2002 01:12:24 -0000	1.3
@@ -34,5 +34,6 @@ extends WikiPlugin
 $page = $request->getPage();
 if (! $page->get('locked')) {
- return $this->error(_("Raw HTML is only allowed in locked pages."));
+ return $this->error(fmt(_("%s is only allowed in locked pages."),
+ _("Raw HTML")));
 }
 
Index: _BackendInfo.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/_BackendInfo.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -2 -b -p -d -r1.17 -r1.18
--- _BackendInfo.php	9 Sep 2002 08:38:19 -0000	1.17
+++ _BackendInfo.php	29 Oct 2002 01:12:24 -0000	1.18
@@ -72,5 +72,7 @@ extends WikiPlugin
 // how to indent this table?
 $val = unserialize($val);
- $rows[] = $this->_showhash (NBSP . NBSP . "get_pagedata('$pagename')['$key']" , $val);
+ $rows[] = HTML(HTML::nbsp(), HTML::nbsp(),
+ $this->_showhash ("get_pagedata('$pagename')['$key']",
+ $val));
 } else {
 if ($key == 'passwd' and ! $request->_user->isAdmin())
@@ -79,8 +81,8 @@ extends WikiPlugin
 'bgcolor' => '#cccccc',
 'style' => 'color:#000000'),
- NBSP . $key . NBSP),
+ HTML(HTML::nbsp(), $key, HTML::nbsp())),
 HTML::td(array('bgcolor' => '#ffffff',
 'style' => 'color:#000000'),
- $val ? $val : NBSP));
+ $val ? $val : HTML::nbsp()));
 }
 }