Merge branch 'bug-1042' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Tue, 12 May 2015 20:50:38 +0000 (22:50 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 12 May 2015 20:50:38 +0000 (22:50 +0200)
1  2 
includes/notary.inc.php
www/wot.php

Simple merge
diff --cc www/wot.php
@@@ -381,16 -374,14 +381,17 @@@ function send_reminder(
                        write_user_agreement($_SESSION['profile']['id'], "CCA", "assurance", "Assuring", 1, $_SESSION['_config']['notarise']['id']);
                        write_user_agreement($_SESSION['_config']['notarise']['id'], "CCA", "assurance", "Being assured", 0, $_SESSION['profile']['id']);
                }
 -              if($_SESSION['profile']['ttpadmin'] == 1 && ($_POST['method'] == 'Trusted 3rd Parties' || $_POST['method'] == 'Trusted Third Parties')) {
 +              if($_SESSION['profile']['ttpadmin'] >= 1 && $_POST['method'] == 'TTP-Assisted') {
                        $query .= ",\n`method`='TTP-Assisted'";
                }
 +              if($_SESSION['profile']['ttpadmin'] == 2 && $_POST['method'] == 'TTP-TOPUP') {
 +                      $query .= ",\n`method`='TTP-TOPUP'";
 +              }
                mysql_query($query);
-               fix_assurer_flag($_SESSION['_config']['notarise']['id']);
                include_once("../includes/notary.inc.php");
  
+               recalculate_old_assurance_points($_SESSION['_config']['notarise']['id']);
+               fix_assurer_flag($_SESSION['_config']['notarise']['id']);
                if($_SESSION['profile']['points'] < 150)
                {
                        $addpoints = 0;