Package: ampache
Followup-For: Bug #668936
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Find attached a patch fixing the wrapper function.
- -- System Information:
Debian Release: wheezy/sid
APT prefers testing
APT policy: (500, 'testing')
Architecture: amd64 (x86_64)
Kernel: Linux 3.2.0-1-amd64 (SMP w/2 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iQHOBAEBAgA4BQJPiyQfMRpodHRwczovL3d3dy5kb21pbmlrLWdlb3JnZS5kZS9n
cGctcG9saWN5LnR4dC5hc2MACgkQ2w6kvOIQdBLNxgv/c7rsonMnHUPBVQbAHfYK
WYsFFQxDd1b585xjy5j1oCK25jA5rtqgQzm09sM6c2A9goZysMypbNaYp0b5DcZI
pIZLmGGGYgukztCDNxlu90M9PIFqiae5rI0a96zrID2XnxoN5gGXmVe865V2dHUF
7iiRuFgyx1jN6EXviYndTFglBDRS9cyYr1K1xLAt4dAyF3WGMPrXrXpyK8jK0hGc
Pqxooj7oc/WmFnkaVgx2Vn/mBykQyFVK6LrRgW9vuhEPX7Auc52/h56CGgXMY8DL
BNFmoDQP/L8JQ8rFd3TwzWtbt7ug/rHY79czN48119iSAtSWYUh0X34BRvAuB1bs
rIO+YsJVOb2D3y2n7DoyNsVYMm59aZ8cwMMej3D9RlfA321csxf73XbNHHs1l+hj
rIKpkJGvcP3btmRbsEv0msVctz4KmECjCww/jh+bve/cnmH4edu0JUlkJ+kgIJGn
zEdjWVaPac/Cmmfk2t0EMKz783HkeaeSr4TChOA0weBg
=OHaK
-----END PGP SIGNATURE-----
--- dba.class.php.orig 2012-04-15 21:21:39.144982976 +0200
+++ dba.class.php 2012-04-15 21:34:14.553891317 +0200
@@ -174,11 +174,14 @@ class Dba {
* doesn't work for updates or inserts
*/
public static function num_rows($resource) {
+ if (!$resource) {
+ return 0;
+ }
$result = mysql_num_rows($resource);
if (!$result) {
- return '0';
+ return 0;
}
return $result;
