diff options
| author | Benny Baumann <BenBE@geshi.org> | 2013-07-23 23:38:31 +0200 |
|---|---|---|
| committer | Benny Baumann <BenBE@geshi.org> | 2013-07-23 23:38:31 +0200 |
| commit | 56e830101351d98510a01a664a34951b2fef9af8 (patch) | |
| tree | 38e86c99b65f9a1ce8e5c9c6b45691d37092d680 | |
| parent | 32bec6416a6f6e40b912a707830b6c7385a9a056 (diff) | |
| parent | d4f46a86d354f1f434e0a6b2f16a4d5fef96b9fa (diff) | |
| download | cacert-devel-56e830101351d98510a01a664a34951b2fef9af8.tar.gz cacert-devel-56e830101351d98510a01a664a34951b2fef9af8.tar.xz cacert-devel-56e830101351d98510a01a664a34951b2fef9af8.zip | |
Merge branch 'bug-1177' into bug-893
| -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 f703087..929158e 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> |