[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 92a6d92e826f056ae788da902dffb0513f1152df

[git@ipfire.org]

[-- Attachment #1: Type: text/plain, Size: 1661 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  92a6d92e826f056ae788da902dffb0513f1152df (commit)
      from  334620ee2bf24a4d80303b766f91bc64178c4042 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 92a6d92e826f056ae788da902dffb0513f1152df
Author: Alexander Marx <alexander.marx(a)ipfire.org>
Date:   Wed Apr 22 13:32:04 2015 +0200

    squid-accounting: fix mistakenly deleted lines from last commit

-----------------------------------------------------------------------

Summary of changes:
 src/squid-accounting/acct-lib.pl | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

Difference in files:
diff --git a/src/squid-accounting/acct-lib.pl b/src/squid-accounting/acct-lib.pl
index 6891235..779ecf8 100644
--- a/src/squid-accounting/acct-lib.pl
+++ b/src/squid-accounting/acct-lib.pl
@@ -337,7 +337,12 @@ sub getmonth{
 		my $monat=$_[0]-1 if($_[0]);
 		my $tag=1;
 		my $time1=timelocal(0,0,0,$tag,$monat,$jahr);
-		my $time2=timelocal(0,0,0,$tag,($monat+1),$jahr);
+		my $time2=0;
+		if (($monat+1) == 12){
+			$time2=timelocal(0,0,0,$tag,0,$jahr+1);
+		}else{
+			$time2=timelocal(0,0,0,$tag,$monat+1,$jahr);
+		}
 		--$time2;
 		return ($time1,$time2);
 }


hooks/post-receive
--
IPFire 2.x development tree