bug 1236: Fixed show detail problem
bug 1236: Use single assignment for global variables
Merge branch 'bug-1236' into testserver-stable

Conflicts:
	includes/account.php
bug 1236: Corrected showdetail handling
Merge branch 'bug-1236' into testserver-stable