On Mon, Nov 17, 2008 at 11:27:21AM +0100, Thijs Kinkhorst wrote: > severity 505929 grave > thanks > > Hi, > > If the package doesn't work with PHP 5.2.6 then that is a grave bug, since > that is the version we're shipping with Lenny.
I'm attaching the dsc and diff.gz from my proposed update. This needs some
testing with a real egroupware setup, though.
Cheers,
Moritz
egroupware_1.4.004-2.dfsg-4.1.diff.gz
Description: Binary data
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Format: 1.0 Source: egroupware Binary: egroupware, egroupware-core, egroupware-addressbook, egroupware-bookmarks, egroupware-calendar, egroupware-developer-tools, egroupware-emailadmin, egroupware-etemplate, egroupware-felamimail, egroupware-filemanager, egroupware-infolog, egroupware-manual, egroupware-mydms, egroupware-news-admin, egroupware-phpbrain, egroupware-phpsysinfo, egroupware-polls, egroupware-projectmanager, egroupware-registration, egroupware-resources, egroupware-sambaadmin, egroupware-sitemgr, egroupware-timesheet, egroupware-tracker, egroupware-wiki Architecture: all Version: 1.4.004-2.dfsg-4.1 Maintainer: Peter Eisentraut <[EMAIL PROTECTED]> Homepage: http://www.egroupware.org/ Standards-Version: 3.8.0 Vcs-Browser: http://svn.debian.org/viewsvn/collab-maint/ext-maint/egroupware/trunk/ Vcs-Svn: svn://svn.debian.org/collab-maint/ext-maint/egroupware/trunk/ Build-Depends: debhelper (>= 5), po-debconf Checksums-Sha1: e63f580001ae454721f7387cf469d9c6e7eaed0f 11597406 egroupware_1.4.004-2.dfsg.orig.tar.gz 4eac2b2362f1a9f6eae26832180597b5d254a3ce 32154 egroupware_1.4.004-2.dfsg-4.1.diff.gz Checksums-Sha256: 8a5e6468cd4812cfb01ce202c0cb010a7b1bb8bb78041ee6024a2ca1402ab61b 11597406 egroupware_1.4.004-2.dfsg.orig.tar.gz 8a205623ac1e24f49c1a8fb67a34855be55c33006e95495e4c674657398e72aa 32154 egroupware_1.4.004-2.dfsg-4.1.diff.gz Files: 26012ca8c976dbf4137f5f5c7abcfdaf 11597406 egroupware_1.4.004-2.dfsg.orig.tar.gz 83ac0519194bb7c3622458c4dc6cd457 32154 egroupware_1.4.004-2.dfsg-4.1.diff.gz -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) iEYEARECAAYFAkkovR0ACgkQXm3vHE4uylqrQgCdE9Ut77XEjlrDiMmpegIa2fYY QXAAoNYFmaD6Kj+g2oGVTl08ZxQ65viX =9EeI -----END PGP SIGNATURE-----
diff -u egroupware-1.4.004-2.dfsg/debian/changelog
egroupware-1.4.004-2.dfsg/debian/changelog
--- egroupware-1.4.004-2.dfsg/debian/changelog
+++ egroupware-1.4.004-2.dfsg/debian/changelog
@@ -1,3 +1,10 @@
+egroupware (1.4.004-2.dfsg-4.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix PHP 5.2.6 compatibility, patches by Ralf Becker (Closes: #505929)
+
+ -- Moritz Muehlenhoff <[EMAIL PROTECTED]> Sun, 23 Nov 2008 02:43:03 +0100
+
egroupware (1.4.004-2.dfsg-4) unstable; urgency=low
* Debconf translation updates (closes: #498957)
only in patch2:
unchanged:
--- egroupware-1.4.004-2.dfsg.orig/etemplate/inc/class.nextmatch_widget.inc.php
+++ egroupware-1.4.004-2.dfsg/etemplate/inc/class.nextmatch_widget.inc.php
@@ -149,13 +149,16 @@
}
if ($this->last_part($name) ==
$nm_global['order']) // we're the active column
{
- $cell[1] = $cell;
- unset($cell[1]['align']);
- $cell[2] =
$tmpl->empty_cell('image',$nm_global['sort'] != 'DESC' ? 'down' : 'up');
- $cell['type'] = 'hbox';
- $cell['size'] = '2,,0,0';
+ $sorting = $cell;
+ unset($sorting['align']);
+ unset($sorting['span']);
+ $cell =
etemplate::empty_cell('hbox','',array(
+ 'span' => $cell['span'],
+ 'size' => '2,,0,0',
+ 1 => $sorting,
+ 2 =>
etemplate::empty_cell('image',$nm_global['sort'] != 'DESC' ? 'down' : 'up'),
+ ));
$class = 'activ_sortcolumn';
- $cell['name'] = $cell['label']
= '';
}
else
{
@@ -190,6 +193,11 @@
$extension_data['old_value'] = $value =
$nm_global['col_filter'][$this->last_part($name)];
return True;
}
+ // does NOT work with php5.2.6 ...
+ if (version_compare(PHP_VERSION,'5.2.6','>='))
+ {
+ $value['bottom_too'] = false;
+ }
// presetting the selectboxes with their default
values, to NOT loop, because post-process thinks they changed
if (!isset($value['cat_id'])) $value['cat_id'] = '';
if (!isset($value['search'])) $value['search'] = '';
only in patch2:
unchanged:
--- egroupware-1.4.004-2.dfsg.orig/etemplate/inc/class.soetemplate.inc.php
+++ egroupware-1.4.004-2.dfsg/etemplate/inc/class.soetemplate.inc.php
@@ -182,7 +182,7 @@
);
if ($attributes && is_array($attributes))
{
- return array_merge($attributes,$cell);
+ $cell += $attributes;
}
return $cell;
}
