Merge branch 'master' of /home/arun/nubati.net/git/e-DoKo

diff --git a/.gitignore b/.gitignore
index a7db7a80510ba13a1895bf85038bb770ac80571d..6a0fae2de564c459e79d86f614a160f47d89584e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,10 @@
 *~
 config.php
-db*sql
\ No newline at end of file
+db*sql
+cache/stats.html
+pics/arrow0.svg
+pics/arrow1.svg
+pics/arrow2.svg
+pics/arrow3.svg
+scoretest.txt
+testscoring.php

diff --git a/include/db.php b/include/db.php
index ad6c6f0cfbae967f536e99073f436ef6b9b8d781..bd50189d69f8435784144621a9d5ccbe4b5e3cd1 100644 (file)
--- a/include/db.php
+++ b/include/db.php
@@ -783,7 +783,7 @@ function DB_get_PREF($myid)
        {
        case 'cardset':
          /* licence only valid until then */
-         if($pref[1]=='altenburg' && (time()-strtotime( '2009-12-31 23:59:59')<0) )
+         if($pref[1]=='altenburg' && (time()-strtotime( '2012-12-31 23:59:59')<0) )
            $PREF['cardset']='altenburg';
          break;