[evolvis-commits] r17866: fix the remaining PHP and XHTML bugs

mirabilos at evolvis.org mirabilos at evolvis.org
Fri Dec 9 12:48:41 CET 2011


Author: mirabilos
Date: 2011-12-09 12:48:41 +0100 (Fri, 09 Dec 2011)
New Revision: 17866

Modified:
   trunk/gforge_base/evolvisforge-5.1/src/common/widget/Widget_Rss.class.php
   trunk/gforge_base/evolvisforge-5.1/src/packaging/control/020common
   trunk/gforge_base/evolvisforge-5.1/src/packaging/control/030web-apache2
Log:
fix the remaining PHP and XHTML bugs

– XHTML fix in Widget_Rss.class.php’s output
– depend on fixed simplepie version (forcibly) and remove the explicit
  php5-idn dependency because libphp-simplepie (= 1.2-2+tarent1) does
  that by itself already and we don’t use php5-idn in the Forge


Modified: trunk/gforge_base/evolvisforge-5.1/src/common/widget/Widget_Rss.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/widget/Widget_Rss.class.php	2011-12-09 11:48:37 UTC (rev 17865)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/widget/Widget_Rss.class.php	2011-12-09 11:48:41 UTC (rev 17866)
@@ -64,7 +64,7 @@
 
 				$i=$i+1;
 
-				$content .= '<tr class="'. $class .'"><td WIDTH="99%">';
+				$content .= '<tr class="'. $class .'"><td width="99%">';
 				if ($image = $item->get_link(0, 'image')) {
 					//hack to display twitter avatar
 					$content .= '<img src="'.  $hp->purify($image, CODENDI_PURIFIER_CONVERT_HTML)  .'" style="float:left; margin-right:1em;" />';

Modified: trunk/gforge_base/evolvisforge-5.1/src/packaging/control/020common
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/packaging/control/020common	2011-12-09 11:48:37 UTC (rev 17865)
+++ trunk/gforge_base/evolvisforge-5.1/src/packaging/control/020common	2011-12-09 11:48:41 UTC (rev 17866)
@@ -1,6 +1,6 @@
 Package: @OLDPACKAGE at -common
 Architecture: all
-Depends: debconf (>= 1.0.32) | debconf-2.0, ucf, cpio, lockfile-progs, adduser, php5-cli, php-htmlpurifier (>= 4.0), libphp-simplepie, python, mksh, xz-utils, sudo, w3c-dtd-xhtml, xmlstarlet, ${misc:Depends}
+Depends: debconf (>= 1.0.32) | debconf-2.0, ucf, cpio, lockfile-progs, adduser, php5-cli, php-htmlpurifier (>= 4.0), libphp-simplepie (>= 1.2-2+tarent1), libphp-simplepie (<< 1.2-3~~), python, mksh, xz-utils, sudo, w3c-dtd-xhtml, xmlstarlet, ${misc:Depends}
 Recommends: php5-perl (>= 1.0.0-2~), libauthen-passphrase-perl
 Conflicts: sourceforge, @OLDPACKAGE at -plugin-scmcvs (<< 4.1), @OLDPACKAGE at -plugin-scmsvn (<< 4.1), @OLDPACKAGE at -plugin-scmccase (<< 4.1), @OLDPACKAGE at -theme-starterpack (<< 4.0)
 Description: collaborative development tool - shared files

Modified: trunk/gforge_base/evolvisforge-5.1/src/packaging/control/030web-apache2
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/packaging/control/030web-apache2	2011-12-09 11:48:37 UTC (rev 17865)
+++ trunk/gforge_base/evolvisforge-5.1/src/packaging/control/030web-apache2	2011-12-09 11:48:41 UTC (rev 17866)
@@ -1,6 +1,6 @@
 Package: @OLDPACKAGE at -web-apache2
 Architecture: all
-Depends: @OLDPACKAGE at -common, @OLDPACKAGE at -db-postgresql | @OLDPACKAGE at -db, libapache2-mod-php5, php5-cgi, php5-pgsql, php5-gd, perl, libdbi-perl, libdbd-pg-perl, debianutils (>= 1.7), debconf (>= 1.0.32) | debconf-2.0, ucf, cronolog, python, ssl-cert, libnusoap-php, php-htmlpurifier (>= 4.0), php5-idn (>= 1.2b-6~), libphp-simplepie, libjs-yui (>= 2.8.2r1~squeeze-1.1~), libjs-prototype (>= 1.7.0-2.1~), libjs-scriptaculous (>= 1.9.0-2~), libjs-jquery (>= 1.6.4-1~), libjs-jquery-tipsy (>= 4-1~), libjs-jquery-ui (>= 1.8.ooops.16+dfsg-1~), libphp-jpgraph, tango-icon-theme, toilet, ${misc:Depends}
+Depends: @OLDPACKAGE at -common, @OLDPACKAGE at -db-postgresql | @OLDPACKAGE at -db, libapache2-mod-php5, php5-cgi, php5-pgsql, php5-gd, perl, libdbi-perl, libdbd-pg-perl, debianutils (>= 1.7), debconf (>= 1.0.32) | debconf-2.0, ucf, cronolog, python, ssl-cert, libnusoap-php, php-htmlpurifier (>= 4.0), libjs-yui (>= 2.8.2r1~squeeze-1.1~), libjs-prototype (>= 1.7.0-2.1~), libjs-scriptaculous (>= 1.9.0-2~), libjs-jquery (>= 1.6.4-1~), libjs-jquery-tipsy (>= 4-1~), libjs-jquery-ui (>= 1.8.ooops.16+dfsg-1~), libphp-jpgraph, tango-icon-theme, toilet, ${misc:Depends}
 Recommends: locales | locales-all
 Provides: @OLDPACKAGE at -web
 Conflicts: @OLDPACKAGE at -web



More information about the evolvis-commits mailing list