summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenny Baumann <BenBE@geshi.org>2013-07-23 23:39:06 +0200
committerBenny Baumann <BenBE@geshi.org>2013-07-23 23:39:06 +0200
commit3cbac6cc51939d04ee6adadcaf07d5b27947d5dc (patch)
tree305c316f3d8b24b7e2d6deb2ce31a81c8246611e
parent23ee6915a319bf79b92c494ced798a8c67817ad3 (diff)
parent56e830101351d98510a01a664a34951b2fef9af8 (diff)
downloadcacert-devel-3cbac6cc51939d04ee6adadcaf07d5b27947d5dc.tar.gz
cacert-devel-3cbac6cc51939d04ee6adadcaf07d5b27947d5dc.tar.xz
cacert-devel-3cbac6cc51939d04ee6adadcaf07d5b27947d5dc.zip
Merge branch 'bug-893' into bug-1136
-rw-r--r--includes/notary.inc.php6
-rw-r--r--pages/account/43.php4
2 files changed, 5 insertions, 5 deletions
diff --git a/includes/notary.inc.php b/includes/notary.inc.php
index 8b7c0a5..55f731c 100644
--- a/includes/notary.inc.php
+++ b/includes/notary.inc.php
@@ -266,7 +266,7 @@
{
?>
<tr>
- <td class="DataTD" colspan="5"><strong><?=$points_txt?>:</strong></td>
+ <td<?=($support == "1")?' colspan="5"':' colspan="3"'?> class="DataTD"><strong><?=$points_txt?>:</strong></td>
<td class="DataTD"><?=$points?></td>
<td class="DataTD">&nbsp;</td>
<td class="DataTD"><strong><?=$experience_txt?>:</strong></td>
@@ -591,14 +591,14 @@
return $issue_points;
}
- function output_given_assurances($userid,$support)
+ function output_given_assurances($userid,$support=0)
{
output_assurances_header(_("Assurance Points You Issued"),$support);
output_given_assurances_content($userid,$points,$sum_experience,$support);
output_assurances_footer(_("Total Points Issued"),$points,_("Total Experience Points"),$sum_experience,$support);
}
- function output_received_assurances($userid,$support)
+ function output_received_assurances($userid,$support=0)
{
output_assurances_header(_("Your Assurance Points"),$support);
output_received_assurances_content($userid,$points,$sum_experience,$support);
diff --git a/pages/account/43.php b/pages/account/43.php
index 1bdbdbc..a942f18 100644
--- a/pages/account/43.php
+++ b/pages/account/43.php
@@ -848,7 +848,7 @@ function showassuredto()
</tr>
<? } ?>
<tr>
- <td class="DataTD" colspan="2"><b><?=_("Total Points")?>:</b></td>
+ <td class="DataTD" colspan="4"><b><?=_("Total Points")?>:</b></td>
<td class="DataTD"><?=$points?></td>
<td class="DataTD" colspan="3">&nbsp;</td>
</tr>
@@ -894,7 +894,7 @@ function showassuredby()
</tr>
<? } ?>
<tr>
- <td class="DataTD" colspan="2"><b><?=_("Total Points")?>:</b></td>
+ <td class="DataTD" colspan="4"><b><?=_("Total Points")?>:</b></td>
<td class="DataTD"><?=$points?></td>
<td class="DataTD" colspan="3">&nbsp;</td>
</tr>