The branch, master has been updated via 3e56021aa43381b6ad1f74077cc9ee42020fecc0 (commit) via 20fb4bbe812e69ae2d9914911d1e6cf038e53a2c (commit) from e554e94d715fbbe5dceac556dc61cb600bb063dd (commit)

- Log ----------------------------------------------------------------- commit 3e56021aa43381b6ad1f74077cc9ee42020fecc0 Author: Michal Čihař mcihar@novell.com Date: Thu Aug 19 10:38:19 2010 +0200

Support for direct generating links to commits.

commit 20fb4bbe812e69ae2d9914911d1e6cf038e53a2c Author: Michal Čihař mcihar@novell.com Date: Thu Aug 19 10:34:50 2010 +0200

Fix template.

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

Summary of changes: templates/security/_PMASA_ | 11 +++++++++++ templates/security/_page.tpl | 24 +++++++++++++++++++++++- 2 files changed, 34 insertions(+), 1 deletions(-)

diff --git a/templates/security/_PMASA_ b/templates/security/_PMASA_ index bf8e4c8..4995066 100644 --- a/templates/security/_PMASA_ +++ b/templates/security/_PMASA_ @@ -57,4 +57,15 @@ Upgrade to phpMyAdmin ???? or newer or apply patch listed below. <py:def function="announcement_patches"> </py:def>

+<!--! Optional section with list of commits fixing this, one per line +<py:def function="announcement_commits"> +</py:def> +--> + +<!--! Optional section with list of commits fixing this for 2.11 branch, one per line +<py:def function="announcement_commits_2_11"> +</py:def> +--> + +<xi:include href="_page.tpl" /> </html> diff --git a/templates/security/_page.tpl b/templates/security/_page.tpl index 1de9e44..8f116d6 100644 --- a/templates/security/_page.tpl +++ b/templates/security/_page.tpl @@ -54,11 +54,33 @@ </p> </py:if>

- <py:if test="defined('announcement_patches')"> + <py:if test="defined('announcement_patches') or defined('announcement_commits') or defined('announcement_commits_2_11')"> <h3>Patches</h3> + + <py:if test="defined('announcement_patches')"> <p>${announcement_patches()}</p> </py:if>

+ <py:if test="defined('announcement_commits')"> + <p>Following commits have been made to fix this issue:</p> + <ul> + <py:for each="hash in announcement_commits().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> + <py:for each="hash in announcement_commits_2_11().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> + <p> For further information and in case of questions, please contact the phpMyAdmin team. Our website is <a href="http://www.phpmyadmin.net/">

hooks/post-receive