Merge branch 'release' into bug-1121 bug-1121
authorMichael Tänzer <neo@nhng.de>
Tue, 14 May 2013 23:19:39 +0000 (01:19 +0200)
committerMichael Tänzer <neo@nhng.de>
Tue, 14 May 2013 23:19:39 +0000 (01:19 +0200)
Conflicts:
www/wot.php

1  2 
www/index.php
www/wot.php

diff --cc www/index.php
Simple merge
diff --cc www/wot.php
@@@ -297,12 -340,7 +340,12 @@@ $iecho= "c"
                }
                mysql_query($query);
                fix_assurer_flag($_SESSION['_config']['notarise']['id']);
-               
 +              include_once("../includes/notary.inc.php");
 +/*to be activated after CCA accept option is implemented in form
 +              write_user_agreement($_SESSION['profile']['id'], "CCA", "assurance", "Assuring", 1, $_SESSION['_config']['notarise']['id']);}*/
 +/* to be activated after the CCA recording is announced
 +              write_user_agreement($_SESSION['_config']['notarise']['id'], "CCA", "assurance", "Being assured", 0, $_SESSION['profile']['id']); */
                if($_SESSION['profile']['points'] < 150)
                {
                        $addpoints = 0;