[git] gnupg-doc - branch, master, updated. 25cd0bed9dc2696ce9abdda560dcd8321d411908

[by Werner Koch]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GnuPG website and other docs".

The branch, master has been updated
       via  25cd0bed9dc2696ce9abdda560dcd8321d411908 (commit)
       via  d465f1b7f3fb9e7414dafbb5fd89fda2ee65e440 (commit)
      from  551a71de65f5ba02e72f77ac9d288db8d986e60d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 25cd0bed9dc2696ce9abdda560dcd8321d411908
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Nov 12 18:57:43 2015 +0100

    web: Fix netzpolitik URL

diff --git a/web/share/gpgweb.el b/web/share/gpgweb.el
index d8ef81e..3fd950f 100644
--- a/web/share/gpgweb.el
+++ b/web/share/gpgweb.el
@@ -295,7 +295,7 @@ string of the source file or nil if not available."
 ")
     (gpgweb--insert-menu gpgweb-gnupg-bottom-menu-alist 0 nil)
     (insert "  <li>
-<a href=\"https://netzpolitik.org\"><img src=\"misc/vds_timeline-300x150.png\" title=\"Germany parliament again adopts data retention act - after the German (in 2010) and the European supreme court (in 2014) nixed such acts.\"></a></li>")
+<a href=\"https://netzpolitik.org\"><img src=\"/misc/vds_timeline-300x150.png\" title=\"Germany parliament again adopts data retention act - after the German (in 2010) and the European supreme court (in 2014) nixed such acts.\"></a></li>")
     (insert "  </ul>
   </div>
 ")

commit d465f1b7f3fb9e7414dafbb5fd89fda2ee65e440
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Nov 12 18:56:31 2015 +0100

    cgi: Fix bug in mail address storing of SEPA preorders.

diff --git a/cgi/procdonate.cgi b/cgi/procdonate.cgi
index 91a1bb0..b58dc16 100755
--- a/cgi/procdonate.cgi
+++ b/cgi/procdonate.cgi
@@ -652,10 +652,8 @@ sub complete_sepa ()
     $request{"Currency"} = $data{"Currency"};
     $request{"Amount"} = $data{"Amount"};
     $request{"Desc"} = "GnuPG SEPA donation";
+    $request{"Email"} = $data{"Mail"} unless $data{"Mail"} eq '';
     $request{"Meta[name]"} = $data{"Name"} unless $data{"Name"} eq 'Anonymous';
-    if ($data{"Mail"} ne '') {
-        $request{"Meta[mail]"} = $data{"Mail"};
-    }
     if ($data{"Message"} ne '') {
         $request{"Meta[message]"} = $data{"Message"};
     }

-----------------------------------------------------------------------

Summary of changes:
 cgi/procdonate.cgi  | 4 +---
 web/share/gpgweb.el | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
The GnuPG website and other docs
http://git.gnupg.org