diff options
| author | Benny Baumann <BenBE@geshi.org> | 2013-07-23 23:39:34 +0200 |
|---|---|---|
| committer | Benny Baumann <BenBE@geshi.org> | 2013-07-23 23:39:34 +0200 |
| commit | 33bd853d0e7034f1ad0755dd717655b650ba541f (patch) | |
| tree | d108a1d9a489ffad6e603f27c5908af37021141d | |
| parent | 5ee8783a5b5012d89ce3ea040a8ad5a14fb2dbbe (diff) | |
| parent | d4f46a86d354f1f434e0a6b2f16a4d5fef96b9fa (diff) | |
| download | cacert-devel-33bd853d0e7034f1ad0755dd717655b650ba541f.tar.gz cacert-devel-33bd853d0e7034f1ad0755dd717655b650ba541f.tar.xz cacert-devel-33bd853d0e7034f1ad0755dd717655b650ba541f.zip | |
Merge branch 'bug-1177' into bug-1137
| -rw-r--r-- | includes/notary.inc.php | 6 | ||||
| -rw-r--r-- | pages/account/43.php | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/includes/notary.inc.php b/includes/notary.inc.php index 32839fe..b8cdb1b 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"> </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 234e01a..841189d 100644 --- a/pages/account/43.php +++ b/pages/account/43.php @@ -837,7 +837,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"> </td> </tr> @@ -883,7 +883,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"> </td> </tr> |