# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1384535772 -7200
# Node ID 41b24a132af8cb7791658f89fd190b6f37982c0c
# Parent  e65b2392fc0ebab5e6ad1d16ff0a150008099ed3# Parent  ef26d16b836e896c9327eb398581aca73f7a92f8
Merged.

diff -r e65b2392fc0e -r 41b24a132af8 attendees.inc.php
--- a/attendees.inc.php	Mon Nov 11 10:37:58 2013 +0200
+++ b/attendees.inc.php	Fri Nov 15 19:16:12 2013 +0200
@@ -36,7 +36,12 @@
   $row = 0;
   foreach ($res as $item)
   {
-    $over = $maxAttendeesSoft > 0 && $index > $maxAttendeesSoft;
+    if ($maxAttendeesHard > 0)
+      $over = $index > $maxAttendeesHard;
+    else
+    if ($maxAttendeesSoft > 0)
+      $over = $index > $maxAttendeesSoft;
+
     stPrintAttendee($item, $row++, FALSE, $over ? " overbooked" : "");
     $index--;
   }