[Phpmyadmin-git] [SCM] phpMyAdmin website branch, master, updated. 5b548054c6de7646a7cd4b6a4067bfcff6f0b526

[Michal Čihař]

The branch, master has been updated
       via  5b548054c6de7646a7cd4b6a4067bfcff6f0b526 (commit)
       via  35fe40f3d7054df572e533a8d22033d558617358 (commit)
      from  aa7e2455dbcbda8ca50f77a0d9606f18f03be072 (commit)


- Log -----------------------------------------------------------------
commit 5b548054c6de7646a7cd4b6a4067bfcff6f0b526
Author: Michal Čihař <mcihar at novell.com>
Date:   Thu Jan 6 09:42:13 2011 +0100

    Add patches for 2.11 and 3.3 as there seems to be high demand for them.

commit 35fe40f3d7054df572e533a8d22033d558617358
Author: Michal Čihař <mcihar at novell.com>
Date:   Mon Dec 13 18:06:27 2010 +0100

    Add missing slash to the url.

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

Summary of changes:
 templates/_page.tpl              |    2 +-
 templates/security/PMASA-2010-10 |    8 ++++++++
 templates/security/PMASA-2010-9  |    8 ++++++++
 templates/security/_page.tpl     |   11 ++++++++++-
 4 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/templates/_page.tpl b/templates/_page.tpl
index 398faf5..81acca3 100644
--- a/templates/_page.tpl
+++ b/templates/_page.tpl
@@ -59,7 +59,7 @@
     <li><a href="${base_url}about-website.${file_ext}" title="Information about website">About</a></li>
     <li class="last">Valid <a href="http://validator.w3.org/check/referer">HTML</a> and <a href="http://jigsaw.w3.org/css-validator/check/referer">CSS</a></li>
     <li class="logo"><a href="http://sourceforge.net/projects/phpmyadmin"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=23067&type=10" width="80" height="15" alt="Get phpMyAdmin at SourceForge.net. Fast, secure and Free Open Source software downloads" /></a></li>
-    <li class="logo"><a class="FlattrButton" style="display:none;" rev="flattr;button:compact;" href="http://www.phpmyadmin.net"></a></li>
+    <li class="logo"><a class="FlattrButton" style="display:none;" rev="flattr;button:compact;" href="http://www.phpmyadmin.net/"></a></li>
   </ul>
 <script type="text/javascript">
 var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
diff --git a/templates/security/PMASA-2010-10 b/templates/security/PMASA-2010-10
index bfa7c05..86fcc0b 100644
--- a/templates/security/PMASA-2010-10
+++ b/templates/security/PMASA-2010-10
@@ -50,5 +50,13 @@ Sommer</a>.
 4d9fd005671b05c4d74615d5939ed45e4d019e4c
 </py:def>
 
+<py:def function="announcement_commits_3_3">
+8928900532d111e849362b6359571a3b079eb9ea
+</py:def>
+
+<py:def function="announcement_commits_2_11">
+373a6626ade37c0fee1dfc7c757ca55c7652874b
+</py:def>
+
 <xi:include href="_page.tpl" />
 </html>
diff --git a/templates/security/PMASA-2010-9 b/templates/security/PMASA-2010-9
index 2a40a9f..3bc51d6 100644
--- a/templates/security/PMASA-2010-9
+++ b/templates/security/PMASA-2010-9
@@ -45,5 +45,13 @@ href="http://www.exploit-db.com/exploits/15699/">Tiger Security Team</a>.
 aa6fec0532a9dd48d4e35831c1b1c9785c124dd7
 </py:def>
 
+<py:def function="announcement_commits_3_3">
+9ebd401b0ea4efea8ddc8cd846da559bf420ccaa
+</py:def>
+
+<py:def function="announcement_commits_2_11">
+b01a58118f973f98ab99a4bb28d340af49fa251f
+</py:def>
+
 <xi:include href="_page.tpl" />
 </html>
diff --git a/templates/security/_page.tpl b/templates/security/_page.tpl
index 3bb7cf4..479b87a 100644
--- a/templates/security/_page.tpl
+++ b/templates/security/_page.tpl
@@ -62,7 +62,7 @@
     </p>
     </py:if>
 
-    <py:if test="defined('announcement_patches') or defined('announcement_commits') or defined('announcement_commits_2_11')">
+    <py:if test="defined('announcement_patches') or defined('announcement_commits') or defined('announcement_commits_2_11') or defined('announcement_commits_3_3')">
     <h3>Patches</h3>
 
     <py:if test="defined('announcement_patches')">
@@ -78,6 +78,15 @@
     </ul>
     </py:if>
 
+    <py:if test="defined('announcement_commits_3_3')">
+    <p>Following commits have been made on 3.3 branch to fix this issue:</p>
+    <ul>
+    <py:for each="hash in announcement_commits_3_3().next()[1].strip().split('\n')">
+    <li><a href="http://phpmyadmin.git.sourceforge.net/git/gitweb.cgi?p=phpmyadmin/phpmyadmin;a=commitdiff;h=${hash}">${hash}</a></li>
+    </py:for>
+    </ul>
+    </py:if>
+
     <py:if test="defined('announcement_commits_2_11')">
     <p>Following commits have been made on 2.11 branch to fix this issue:</p>
     <ul>


hooks/post-receive
-- 
phpMyAdmin website