cvs: docweb /include/rfc rfc.php /www/rfc rfc-proposal-show.php
| From: | Vincent Gevers | Date: | Sun, 11 Sep 2005 12:41:04 +0000 |
| Subject: | cvs: docweb /include/rfc rfc.php /www/rfc rfc-proposal-show.php | ||
| Groups: | php.doc.web | ||
| Request: | Send a blank email to doc-web+get-832@lists.php.net to get a copy of this message | ||
vincent Sun Sep 11 08:41:04 2005 EDT
Modified files:
/docweb/include/rfc rfc.php
/docweb/www/rfc rfc-proposal-show.php
Log:
Sync with pearweb pepr
http://cvs.php.net/diff.php/docweb/include/rfc/rfc.php?r1=1.20&r2=1.21&ty=u
Index: docweb/include/rfc/rfc.php
diff -u docweb/include/rfc/rfc.php:1.20 docweb/include/rfc/rfc.php:1.21
--- docweb/include/rfc/rfc.php:1.20 Sun Jul 31 09:57:02 2005
+++ docweb/include/rfc/rfc.php Sun Sep 11 08:41:02 2005
@@ -24,7 +24,7 @@
* @author Daniel Convissor <danielc@php.net>
* @copyright Copyright (c) 1997-2004 The PHP Group
* @license http://www.php.net/license/3_0.txt
PHP License
- * @version $Id: rfc.php,v 1.20 2005/07/31 13:57:02 vincent Exp $
+ * @version $Id: rfc.php,v 1.21 2005/09/11 12:41:02 vincent Exp $
*/
$path = realpath(dirname(__FILE__));
@@ -416,7 +416,8 @@
if (!$res) {
return $res;
}
- return new proposal($res);
+ $t = new proposal($res);
+ return $t;
}
function &getAll(&$dbh, $status = null, $limit = null, $order= null)
http://cvs.php.net/diff.php/docweb/www/rfc/rfc-proposal-show.php?r1=1.15&r2=1.16&ty=u
Index: docweb/www/rfc/rfc-proposal-show.php
diff -u docweb/www/rfc/rfc-proposal-show.php:1.15 docweb/www/rfc/rfc-proposal-show.php:1.16
--- docweb/www/rfc/rfc-proposal-show.php:1.15 Sat Jul 30 10:42:36 2005
+++ docweb/www/rfc/rfc-proposal-show.php Sun Sep 11 08:41:04 2005
@@ -19,7 +19,7 @@
* @author Daniel Convissor <danielc@php.net>
* @copyright Copyright (c) 1997-2004 The PHP Group
* @license http://www.php.net/license/3_0.txt
PHP License
- * @version $Id: rfc-proposal-show.php,v 1.15 2005/07/30 14:42:36 vincent Exp $
+ * @version $Id: rfc-proposal-show.php,v 1.16 2005/09/11 12:41:04 vincent Exp $
*/
/**
@@ -89,7 +89,7 @@
default:
require_once 'HTML/BBCodeParser.php';
$bbparser = new HTML_BBCodeParser(array('filters' =>
'Basic,Images,Links,Lists,Extended'));
- $describtion = $bbparser->qparse(nl2br(htmlentities($proposal->pkg_describtion)));
+ $describtion = nl2br(htmlentities($bbparser->qparse($proposal->pkg_describtion)));
}
?>