Merge branch 'master' of git://git.neuf.no/inside

This commit is contained in:
root@amen committed 2013-08-28 23:33:51 +02:00
commit 1a683958e3
1 file changed
+1 -1
+1 -1
View File
@@ -3159,7 +3159,7 @@ Om dere lager en facebook side til arrangementet, ikke glem å putte inn le
error("error: " . $conn->toString());
}
$since = scriptParam("since") ? scriptParam("since") : date('Y-m-d', strtotime( "-1 year" , getNextMembershipExpiryDate() ) );
$since = scriptParam("since") ? scriptParam("since") : date('Y-m-d', strtotime( getNextMembershipExpiryDate() . " -1 year" ) );
$sql = "SELECT * FROM din_sms_received WHERE `date` > '$since' ORDER BY date";
$result = $conn->query($sql);