[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#684007: marked as done (unblock: ukolovnik/1.4-1)

Your message dated Wed, 8 Aug 2012 02:32:58 +0200
with message-id <20120808003258.GI31731@mraw.org>
and subject line Re: Bug#684007: unblock: ukolovnik/1.4-1
has caused the Debian Bug report #684007,
regarding unblock: ukolovnik/1.4-1
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
684007: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=684007
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Please unblock package ukolovnik, where I've just uploaded new upstream
version to unstable.

The only important change it brings are new translations. Besides that
it fixes few tiny errors (possibly unset variables and checking if
locales are present), see attached diff for code changes.

This is not really an important update, but I think it would be good to
include new translations.

Thanks
	Michal Čihař | http://cihar.com | http://blog.cihar.com

unblock ukolovnik/1.4-1

- -- System Information:
Debian Release: wheezy/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (500, 'stable'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 3.1.10-1.16-desktop (SMP w/2 CPU cores; PREEMPT)
Locale: LANG=cs_CZ.UTF-8, LC_CTYPE=cs_CZ.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)

iQIcBAEBCAAGBQJQH4a+AAoJEGo39bHX+xdNBCIQAM+moGWXasiz0pDv8f7kfwFH
vFXejIYzjWs/I4ZZ5IOz5/4CxSFAx/6clPdmEbPjRDDYUVKix6PO23qUBFg+t8ML
14wpS4jQA0SDtCGUfb5QwrIHRXJAQEJbmG0Wu+RRByuBRlxPlY5FoWCpN+HgSZif
1a3wmRththRK/j5qw+i5kyAZlIbzavrb3q7EtW4f5KFazy/gLA9clC2yQ6CcIW2p
NnPoZQ78lpozeaEv/PgA7sVnurEuloDL+wZMI0jvVn0VkhZkkhoTuv87Bgd9wVJF
4W17ayuWbqdbLXd+os63g0vMJkznKcHFYfjAphKFk+Is21uX2ybXD5MjFs6nPB+c
ZnYS0R7g0JyJze4B2jhSX70GcGLpNVV1PEOhYCgOWmYfGfy6cg966eEmdauAxj/Q
7zg8tcHuiJu4pcy7wGUqXjLNTkDogHmxuKM0xWGhkGnz/0kyiXPPv+dmXF9MCW7n
Y+I+faSMJzep0pkDjT8DncH+/HLLCOFJpf2R53dtKifKe84vC1mYjqw3E+78MIlI
f7fYLOQBtfZnMYvIQwUDqcTSJFatAahmJYq4/DVdP35gPUr6P0jnpb4diZPVWsRj
pCE6NiUvCWvozHpdxm0KFOXXUI4OQrfa0jrKc/odYzeuoo1PKWGqxXz8EGxT3lbe
ueSgfyDzq5Ta/AxS1Rxc
=zj4s
-----END PGP SIGNATURE-----

diff -Nru ukolovnik-1.3/index.php ukolovnik-1.4/index.php
--- ukolovnik-1.3/index.php	2010-10-06 17:00:03.000000000 +0200
+++ ukolovnik-1.4/index.php	2012-08-06 10:39:27.000000000 +0200
@@ -218,11 +218,12 @@
                 echo '<th>' . _('Created') . '</th>';
                 echo '<th>' . _('Actions') . '</th></tr></thead>';
                 echo '<tbody>';
+                $oldcategory = null;
                 while ($row = mysql_fetch_assoc($q)) {
                     if ($oldcategory != $row['category'] && CONFIG_get('main_style')==1) {
                         echo '<tr><td colspan="4"><b>'. htmlspecialchars($categories[$row['category']]) .'</b></td></tr>'."\n";
                     }
-            $oldcategory = $row['category'];
+                    $oldcategory = $row['category'];
                     echo '<tr class="priority' . $row['priority'];
                     if (!is_null($row['closed']) && $row['closed'] != 0) {
                         echo ' closed';
@@ -757,7 +758,7 @@
             header('Content-Type: text/plain; charset=utf-8');
             header('Content-Disposition: attachment; filename="ukolovnik.csv"');
 
-            $q = SQL_do('SELECT id,category,UNIX_TIMESTAMP(created) AS created,priority,title,description,UNIX_TIMESTAMP(closed) AS closed FROM ' . $GLOBALS['table_prefix'] . 'tasks ' . $filter . ' ORDER BY priority DESC, created ASC');
+            $q = SQL_do('SELECT id,category,UNIX_TIMESTAMP(created) AS created,priority,title,description,UNIX_TIMESTAMP(closed) AS closed FROM ' . $GLOBALS['table_prefix'] . 'tasks ORDER BY priority DESC, created ASC');
             echo "priority,title,description,category,created,closed\n";
             if (mysql_num_rows($q) > 0) {
                 while ($row = mysql_fetch_assoc($q)) {
diff -Nru ukolovnik-1.3/lib/locale.php ukolovnik-1.4/lib/locale.php
--- ukolovnik-1.3/lib/locale.php	2010-10-06 17:00:03.000000000 +0200
+++ ukolovnik-1.4/lib/locale.php	2012-08-06 10:39:27.000000000 +0200
@@ -45,8 +45,13 @@
 function LOCALE_list() {
     global $locale_path;
 
-    $d = opendir($locale_path);
     $langs = array('en' => 'en');
+
+    if (!is_dir($locale_path)) {
+        return $langs;
+    }
+
+    $d = opendir($locale_path);
     if ($d) {
         while (($file = readdir($d)) !== false) {
             $matches = array();

--- End Message ---
--- Begin Message --- 
Michal Čihař <nijel@debian.org> (07/08/2012):
> Cyril Brulebois <kibi@debian.org> napsal(a):
> > I think I could understand the logic behind setting $oldcategory to
> > null, 
> 
> It is name of previous category used for grouping. Before entering
> while loop this was previously unset causing PHP warning.
> 
> > but I'm not sure why the $filter goes away entirely? Maybe it was
> > unset? (Not clear from the diff.)
> 
> It was not used (and set) at all in this code path.

Thanks for the follow-up.

Unblocked.

Mraw,
KiBi.

Attachment: signature.asc
Description: Digital signature


--- End Message ---
Reply to: