fucking git..

kestasjk · Sep 4, 2011 · f0e0520 · f0e0520
1 parent c155959
commit f0e0520
Show file tree

Hide file tree

Showing 4 changed files with 624 additions and 130 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,7 +8,8 @@ orderlogs/
 *.tgz
 *.tbz
 *.bz2
-cache/
+/cache/
+/variants/*/cache/*
 /mapstore/
 /doc/phpDoc/
 pointslog.txt
@@ -17,4 +18,5 @@ pointlog.txt
 /.buildpath
 /.project
 /datc/maps/
-!.htaccess
+!.htaccess
+
diff --git a/admin/adminActionsRestricted.php b/admin/adminActionsRestricted.php
@@ -229,7 +229,7 @@ public function globalAddTime(array $params)
 			$DB->sql_put('UPDATE wD_Games SET processTime = processTime+'.round($timeHours*60*60).'
 				WHERE processStatus="Not-processing" AND NOT phase="Finished" AND
 					(
-					( phase="Pre-game" AND processTime-'.time().'<=phaseMinutes*60 )
+					( phase="Pre-game" AND processTime<=phaseMinutes*60+'.time().' )
 					OR (NOT phase="Pre-game" AND '.round($timeHours*60*60).'<=phaseMinutes*60 )
 					)');