Merge branch 'bug-28' into release
authorBenny Baumann <BenBE@geshi.org>
Sun, 23 Nov 2014 14:21:16 +0000 (15:21 +0100)
committerBenny Baumann <BenBE@geshi.org>
Sun, 23 Nov 2014 14:21:16 +0000 (15:21 +0100)
Conflicts:
includes/account.php
scripts/cron/warning.php
www/disputes.php
www/wot.php

1  2 
includes/account.php
includes/lib/l10n.php
scripts/cron/warning.php
www/disputes.php
www/wot.php

@@@ -2789,15 -2622,12 +2790,16 @@@ function buildSubjectFromSession() 
  
                        sendmail($row['email'], "[CAcert.org] "._("Password Update Notification"), $body,
                                                "support@cacert.org", "", "", "CAcert Support");
+               L10n::set_translation($my_translation);
                }
 +
                showfooter();
                exit;
 +      }elseif($oldid == 44 && $ticketvalidation == FALSE){
 +              $_SESSION['ticketmsg']='No password reset taken. Ticket number is missing!';
        }
  
 +
        if($process != "" && $oldid == 45)
        {
                $CSR = clean_csr($CSR);
Simple merge
@@@ -18,7 -18,7 +18,8 @@@
  */
  
        require_once(dirname(__FILE__).'/../../includes/mysql.php');
 +      require_once(dirname(__FILE__).'/../../includes/lib/general.php');
+       require_once(dirname(__FILE__).'/../../includes/lib/l10n.php');
  
        $days = array("1" => "3", "15" => "2", "30" => "1", "45" => "0");
  
@@@ -17,7 -17,7 +17,8 @@@
  */ ?>
  <?
        require_once("../includes/loggedin.php");
 +      require_once("../includes/notary.inc.php");
+       require_once("../includes/lib/l10n.php");
  
        loadem("account");
  
diff --cc www/wot.php
  <?
  require_once("../includes/loggedin.php");
  require_once("../includes/lib/l10n.php");
 +require_once("../includes/notary.inc.php");
 +
  
  function show_page($target,$message,$error)
  {
        showheader(_("My CAcert.org Account!"));