Merge branch 'bug-1176' into release
authorBenny Baumann <BenBE@geshi.org>
Fri, 12 Jul 2013 19:16:37 +0000 (21:16 +0200)
committerBenny Baumann <BenBE@geshi.org>
Fri, 12 Jul 2013 19:16:37 +0000 (21:16 +0200)
1  2 
includes/general.php
pages/account/43.php

Simple merge
@@@ -888,19 -886,21 +890,21 @@@ function showassuredby(
  </table>
  <? } ?>
  <br><br>
 -<? } } 
 +<? } }
  
- switch ($_GET['shownotary'])
-         {
-       case 'assuredto':       showassuredto();
-                               break;
-       case 'assuredby':       showassuredby();
-                               break;
-       case 'assuredto15':     output_received_assurances(intval($_GET['userid']),1);
-                               break;
-       case 'assuredby15':     output_given_assurances(intval($_GET['userid']),1);
-                               break;
-       }
- ?>
+ if(isset($_GET['shownotary'])) {
+     switch($_GET['shownotary']) {
+         case 'assuredto':
+             showassuredto();
+             break;
+         case 'assuredby':
+             showassuredby();
+             break;
+         case 'assuredto15':
+             output_received_assurances(intval($_GET['userid']),1);
+             break;
+         case 'assuredby15':
+             output_given_assurances(intval($_GET['userid']),1);
+             break;
+     }
+ }