Merge branch 'bug-1042' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Tue, 9 Jun 2015 20:55:22 +0000 (22:55 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 9 Jun 2015 20:55:22 +0000 (22:55 +0200)
1  2 
includes/notary.inc.php
pages/account/43.php

@@@ -445,13 -441,13 +441,13 @@@ define('THAWTE_REVOCATION_DATETIME', '2
  <?
                }
  ?>
 -              <td class="DataTD"><strong><?=_("Who")?></strong></td>
 -              <td class="DataTD"><strong><?=_("Points")?></strong></td>
 -              <td class="DataTD"><strong><?=_("Location")?></strong></td>
 -              <td class="DataTD"><strong><?=_("Method")?></strong></td>
 -              <td class="DataTD"><strong><?=_("Experience Points")?></strong></td>
 +      <td class="DataTD"><strong><?=_("Who")?></strong></td>
 +      <td class="DataTD"><strong><?=_("Points")?></strong></td>
 +      <td class="DataTD"><strong><?=_("Location")?></strong></td>
 +      <td class="DataTD"><strong><?=_("Method")?></strong></td>
 +      <td class="DataTD"><strong><?=_("Experience Points")?></strong></td>
  <?
-               if ($log == 1)
+               if ($log == 1 || $support == 1)
                {
  ?>
                <td class="DataTD"><strong><?=_("Revoked")?></strong></td>
                <td class="DataTD"><strong><?=$experience_txt?>:</strong></td>
                <td class="DataTD"><?=intval($sumexperience)?></td>
  <?
-               if ($log == 1)
+               if ($log == 1 || $support == 1)
                {
  ?>
 -              <td class="DataTD">&nbsp;</td>
 +      <td class="DataTD">&nbsp;</td>
  <?
                }
  ?>
Simple merge