Git

git@phpmyadmin.net

13 participants
38229 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA1-11-ge71b21b
by Marc Delisle 14 Dec '10

14 Dec '10

The branch, master has been updated via e71b21b6846ff481135df7286d6563467796169b (commit) from 887764266a269bd5be08b3bbab2a3dae5ca7b25c (commit) - Log ----------------------------------------------------------------- commit e71b21b6846ff481135df7286d6563467796169b Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Dec 14 09:43:19 2010 -0500 English mistake ----------------------------------------------------------------------- Summary of changes: Documentation.html | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Documentation.html b/Documentation.html index 9bb7d48..2e45edc 100644 --- a/Documentation.html +++ b/Documentation.html @@ -838,7 +838,7 @@ since this link provides funding for phpMyAdmin. <dt><span id="cfg_Servers_hide_db">$cfg['Servers'][$i]['hide_db']</span> string </dt> - <dd>Regular expression for hiding some databases to unprivileged users. + <dd>Regular expression for hiding some databases from unprivileged users. This only hides them from listing, but a user is still able to access them (using, for example, the SQL query area). To limit access, use the MySQL privilege system. hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA1-10-g8877642
by Marc Delisle 14 Dec '10

14 Dec '10

The branch, master has been updated via 887764266a269bd5be08b3bbab2a3dae5ca7b25c (commit) from 5d915f1ff6e04a40c748ad42ad212fa91992d70e (commit) - Log ----------------------------------------------------------------- commit 887764266a269bd5be08b3bbab2a3dae5ca7b25c Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Dec 14 09:36:54 2010 -0500 Clarify hide_db ----------------------------------------------------------------------- Summary of changes: Documentation.html | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/Documentation.html b/Documentation.html index 2d53af6..9bb7d48 100644 --- a/Documentation.html +++ b/Documentation.html @@ -838,7 +838,8 @@ since this link provides funding for phpMyAdmin. <dt><span id="cfg_Servers_hide_db">$cfg['Servers'][$i]['hide_db']</span> string </dt> - <dd>Regular expression for hiding some databases. This only hides them + <dd>Regular expression for hiding some databases to unprivileged users. + This only hides them from listing, but a user is still able to access them (using, for example, the SQL query area). To limit access, use the MySQL privilege system. <br /><br /> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, export_xml, created. RELEASE_3_4_0BETA1-10-gd03cf63
by Dieter Adriaenssens 13 Dec '10

13 Dec '10

The branch, export_xml has been created at d03cf63a9fd29b12943b10520b860ca6eb13d2a5 (commit) - Log ----------------------------------------------------------------- commit d03cf63a9fd29b12943b10520b860ca6eb13d2a5 Author: Aamir Khan <systemw0rm(a)users.sourceforge.net> Date: Mon Dec 13 22:19:52 2010 +0100 add 'structure schema' to export options ----------------------------------------------------------------------- hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA1-9-g5d915f1
by Dieter Adriaenssens 13 Dec '10

13 Dec '10

The branch, master has been updated via 5d915f1ff6e04a40c748ad42ad212fa91992d70e (commit) via 8afdcbe2b89888b4e7e3ca58224cb01ebe8db73c (commit) from ce446d8f6884d737142f58ccaf6de3dd61109c84 (commit) - Log ----------------------------------------------------------------- commit 5d915f1ff6e04a40c748ad42ad212fa91992d70e Merge: ce446d8f6884d737142f58ccaf6de3dd61109c84 8afdcbe2b89888b4e7e3ca58224cb01ebe8db73c Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: Mon Dec 13 21:36:51 2010 +0100 Merge branch 'QA_3_3' Conflicts: libraries/sqlparser.lib.php ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/sqlparser.lib.php | 33 ++++++++++++++++++++------------- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index a804ef8..7eb6924 100644 --- a/ChangeLog +++ b/ChangeLog @@ -136,6 +136,7 @@ thanks to Craig Duncan - duncan3dc - bug #3112614 [pdf schema] Scratchboard for PDF pages not working - bug #3125606 [parser] Query for table "level" causes strange display +- bug #3127904 [parser] Close all opened round brackets indents 3.3.8.1 (2010-11-29) - bug #3115519 (private) [security] XSS on db search, see PMASA-2010-8 diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php index a6676e4..e5d2f6e 100644 --- a/libraries/sqlparser.lib.php +++ b/libraries/sqlparser.lib.php @@ -2197,7 +2197,6 @@ if (! defined('PMA_MINIMUM_COMMON')) { // DEBUG echo "Loop format <strong>" . $arr[$i]['data'] . "</strong> " . $arr[$i]['type'] . "<br />"; $before = ''; $after = ''; - $indent = 0; // array_shift($typearr); /* 0 prev2 @@ -2297,17 +2296,20 @@ if (! defined('PMA_MINIMUM_COMMON')) { } break; case 'punct_bracket_close_round': - $bracketlevel--; - if ($infunction == TRUE) { - $functionlevel--; - $after .= ' '; - $before .= ' '; - } else { - $indent--; - $before .= ($mode != 'query_only' ? '</div>' : ' '); - } - $infunction = ($functionlevel > 0) ? TRUE : FALSE; - break; + // only close bracket level when it was opened before + if ($bracketlevel > 0) { + $bracketlevel--; + if ($infunction == TRUE) { + $functionlevel--; + $after .= ' '; + $before .= ' '; + } else { + $indent--; + $before .= ($mode != 'query_only' ? '</div>' : ' '); + } + $infunction = ($functionlevel > 0) ? TRUE : FALSE; + } + break; case 'alpha_columnType': if ($docu) { switch ($arr[$i]['data']) { @@ -2610,7 +2612,12 @@ if (! defined('PMA_MINIMUM_COMMON')) { } $str .= $after; } // end for - /* End possibly unclosed documentation link */ + // close unclosed indent levels + while ($indent > 0) { + $indent--; + $str .= ($mode != 'query_only' ? '</div>' : ' '); + } + /* End possibly unclosed documentation link */ if ($close_docu_link) { $str .= '</a>'; $close_docu_link = false; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_8-23-g8afdcbe
by Dieter Adriaenssens 13 Dec '10

13 Dec '10

The branch, QA_3_3 has been updated via 8afdcbe2b89888b4e7e3ca58224cb01ebe8db73c (commit) from b6f717a6025c3785430c4cf317cfa5786564729b (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/sqlparser.lib.php | 31 +++++++++++++++++++------------ 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9c9b92a..988feaf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,6 +15,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA thanks to Craig Duncan - duncan3dc - bug #3112614 [pdf schema] Scratchboard for PDF pages not working - bug #3125606 [parser] Query for table "level" causes strange display +- bug #3127904 [parser] Close all opened round brackets indents 3.3.8.1 (2010-11-29) - bug #3115519 (private) [security] XSS on db search, see PMASA-2010-8 diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php index 738d2fb..3db5308 100644 --- a/libraries/sqlparser.lib.php +++ b/libraries/sqlparser.lib.php @@ -2165,7 +2165,6 @@ if (! defined('PMA_MINIMUM_COMMON')) { // DEBUG echo "Loop format <strong>" . $arr[$i]['data'] . "</strong> " . $arr[$i]['type'] . "<br />"; $before = ''; $after = ''; - $indent = 0; // array_shift($typearr); /* 0 prev2 @@ -2265,17 +2264,20 @@ if (! defined('PMA_MINIMUM_COMMON')) { } break; case 'punct_bracket_close_round': - $bracketlevel--; - if ($infunction == TRUE) { - $functionlevel--; - $after .= ' '; - $before .= ' '; - } else { - $indent--; - $before .= ($mode != 'query_only' ? '</div>' : ' '); - } - $infunction = ($functionlevel > 0) ? TRUE : FALSE; - break; + // only close bracket level when it was opened before + if ($bracketlevel > 0) { + $bracketlevel--; + if ($infunction == TRUE) { + $functionlevel--; + $after .= ' '; + $before .= ' '; + } else { + $indent--; + $before .= ($mode != 'query_only' ? '</div>' : ' '); + } + $infunction = ($functionlevel > 0) ? TRUE : FALSE; + } + break; case 'alpha_columnType': if ($typearr[3] == 'alpha_columnAttrib') { $after .= ' '; @@ -2466,6 +2468,11 @@ if (! defined('PMA_MINIMUM_COMMON')) { } $str .= $after; } // end for + // close unclosed indent levels + while ($indent > 0) { + $indent--; + $str .= ($mode != 'query_only' ? '</div>' : ' '); + } if ($mode=='color') { $str .= '</span>'; } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA1-7-gce446d8
by Marc Delisle 13 Dec '10

13 Dec '10

The branch, master has been updated via ce446d8f6884d737142f58ccaf6de3dd61109c84 (commit) from dc3c5de91ee3ec33f1c1285278993b568bc1696c (commit) - Log ----------------------------------------------------------------- commit ce446d8f6884d737142f58ccaf6de3dd61109c84 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Dec 13 13:12:38 2010 -0500 bug #3100780 Designer export can be confusing ----------------------------------------------------------------------- Summary of changes: pmd_pdf.php | 107 ++++++++++++++++++++++++++++++++-------------------------- 1 files changed, 59 insertions(+), 48 deletions(-) diff --git a/pmd_pdf.php b/pmd_pdf.php index beec1e0..89f6b5e 100644 --- a/pmd_pdf.php +++ b/pmd_pdf.php @@ -15,24 +15,38 @@ if (! isset($scale)) { include_once 'pmd_save_pos.php'; } -if (isset($scale) && ! isset($createpage)) { - if (empty($pdf_page_number)) { +if (isset($mode)) { + if ('create_export' != $mode && empty($pdf_page_number)) { die("<script>alert('Pages not found!');history.go(-2);</script>"); } $pmd_table = PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($GLOBALS['cfgRelation']['designer_coords']); $pma_table = PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_coords']); $scale_q = PMA_sqlAddslashes($scale); - $pdf_page_number_q = PMA_sqlAddslashes($pdf_page_number); - if (isset($exp)) { + if ('create_export' == $mode) { + /* + * @see pdf_pages.php + */ + $query_default_option = PMA_DBI_QUERY_STORE; + $pdf_page_number = PMA_REL_create_page($newpage, $cfgRelation, $db, $query_default_option); + if ($pdf_page_number > 0) { + $message = PMA_Message::success(__('Page has been created')); + $mode = 'export'; + } else { + $message = PMA_Message::error(__('Page creation failed')); + } + } + + $pdf_page_number_q = PMA_sqlAddslashes($pdf_page_number); + if ('export' == $mode) { $sql = "REPLACE INTO " . $pma_table . " (db_name, table_name, pdf_page_number, x, y) SELECT db_name, table_name, " . $pdf_page_number_q . ", ROUND(x/" . $scale_q . ") , ROUND(y/" . $scale_q . ") y FROM " . $pmd_table . " WHERE db_name = '" . PMA_sqlAddslashes($db) . "'"; PMA_query_as_controluser($sql,TRUE,PMA_DBI_QUERY_STORE); } - if (isset($imp)) { + if ('import' == $mode) { PMA_query_as_controluser( 'UPDATE ' . $pma_table . ',' . $pmd_table . ' SET ' . $pmd_table . '.`x`= ' . $pma_table . '.`x` * '. $scale_q . ', @@ -45,22 +59,6 @@ if (isset($scale) && ! isset($createpage)) { ' . $pmd_table . '.`db_name`=\''. PMA_sqlAddslashes($db) .'\' AND pdf_page_number = ' . $pdf_page_number_q . ';', TRUE, PMA_DBI_QUERY_STORE); } - - die("<script>alert('__('Modifications have been saved')');history.go(-2);</script>"); -} - -if (isset($createpage)) { - /* - * @see pdf_pages.php - */ - $query_default_option = PMA_DBI_QUERY_STORE; - - $pdf_page_number = PMA_REL_create_page($newpage, $cfgRelation, $db, $query_default_option); - if ($pdf_page_number > 0) { - $message = PMA_Message::success(__('Page has been created')); - } else { - $message = PMA_Message::error(__('Page creation failed')); - } } // no need to use pmd/styles @@ -76,10 +74,45 @@ require_once './libraries/header_meta_style.inc.php'; } ?> <form name="form1" method="post" action="pmd_pdf.php"> -<?php echo PMA_generate_common_hidden_inputs($db); ?> - <div> - <fieldset><legend><?php echo __('Export') . '/' . __('Import'); ?></legend> - <p><?php echo __('Export/Import to scale'); ?>: +<?php +echo PMA_generate_common_hidden_inputs($db); +echo '<div>'; +echo '<fieldset><legend>' . __('Import/Export coordinates for PDF schema') . '</legend>'; + +$choices = array(); + +$table_info_result = PMA_query_as_controluser('SELECT * FROM ' + . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['pdf_pages']) + . ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\''); + +if (PMA_DBI_num_rows($table_info_result) > 0) { + echo '<p>' . __('Page') . ':'; + echo '<select name="pdf_page_number">'; + + while($page = PMA_DBI_fetch_assoc($table_info_result)) { + echo '<option value="' . $page['page_nr'] . '">'; + echo htmlspecialchars($page['page_descr']); + echo '</option>'; + } + echo '</select>'; + echo '</p>'; + $choices['import'] = __('Import from selected page'); + $choices['export'] = __('Export to selected page'); +} +$choices['create_export'] = __('Create a page and export to it'); + +if (1 == count($choices)) { + echo $choices['create_export']; + echo '<input type="hidden" name="mode" value="create_export" />'; +} else { + PMA_display_html_radio('mode', $choices, $checked_choice = '', $line_break = true, $escape_label = false, $class=''); +} +echo '<br />'; +echo '<label for="newpage">' . __('New page name: ') . '</label>'; +echo '<input id="newpage" type="text" name="newpage" />'; + +echo '<p>' . __('Export/Import to scale') . ':'; +?> <select name="scale"> <option value="1">1:1</option> <option value="2">1:2</option> @@ -88,29 +121,7 @@ require_once './libraries/header_meta_style.inc.php'; <option value="5">1:5</option> </select> </p> - <p><?php echo __('to/from page'); ?>: - - <select name="pdf_page_number"> - <?php - $table_info_result = PMA_query_as_controluser('SELECT * FROM ' - . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['pdf_pages']) - . ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\''); - while($page = PMA_DBI_fetch_assoc($table_info_result)) - { - ?> - <option value="<?php echo $page['page_nr'] ?>"><?php echo htmlspecialchars($page['page_descr']) ?></option> - <?php - } - ?> - </select> - <input type="submit" name="exp" value="<?php echo __('Export'); ?>"> - <input type="submit" name="imp" value="<?php echo __('Import'); ?>"> - </fieldset> - </div> - <div> - <fieldset><legend><?php echo __('Create a page'); ?></legend> - <input type="text" name="newpage" /> - <input type="submit" name="createpage" value="<?php echo __('Go'); ?>"> + <input type="submit" value="<?php echo __('Go'); ?>"> </fieldset> </div> </form> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin website branch, master, updated. d19571307fd6f20f1a9e908990050aa05d4cabdb
by Marc Delisle 13 Dec '10

13 Dec '10

The branch, master has been updated via d19571307fd6f20f1a9e908990050aa05d4cabdb (commit) from 34489a217cf5b4b79300b57b5f5d08d7c3ef2498 (commit) - Log ----------------------------------------------------------------- commit d19571307fd6f20f1a9e908990050aa05d4cabdb Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Dec 13 10:04:03 2010 -0500 Update team list and photos ----------------------------------------------------------------------- Summary of changes: images/heads/dieter.jpg | Bin 0 -> 2242 bytes images/heads/marc.jpg | Bin 0 -> 7999 bytes images/heads/marc.png | Bin 7456 -> 0 bytes templates/team.tpl | 15 ++++++++++++++- 4 files changed, 14 insertions(+), 1 deletions(-) create mode 100644 images/heads/dieter.jpg create mode 100644 images/heads/marc.jpg delete mode 100644 images/heads/marc.png diff --git a/images/heads/dieter.jpg b/images/heads/dieter.jpg new file mode 100644 index 0000000..9570e37 Binary files /dev/null and b/images/heads/dieter.jpg differ diff --git a/images/heads/marc.jpg b/images/heads/marc.jpg new file mode 100644 index 0000000..d4f3fce Binary files /dev/null and b/images/heads/marc.jpg differ diff --git a/images/heads/marc.png b/images/heads/marc.png deleted file mode 100644 index e7e496a..0000000 Binary files a/images/heads/marc.png and /dev/null differ diff --git a/templates/team.tpl b/templates/team.tpl index 8a724a0..1f65b02 100644 --- a/templates/team.tpl +++ b/templates/team.tpl @@ -25,7 +25,7 @@ You can follow developers blogs at <h3 class="fn">Marc Delisle</h3> -<img class="head photo" src="${server}${base_url}images/heads/marc.png" alt="Photo of Marc Delisle" /> +<img class="head photo" src="${server}${base_url}images/heads/marc.jpg" alt="Photo of Marc Delisle" /> <p> Marc took over the <span class="org">phpMyAdmin</span> project from founder Tobias Ratschiller and started a new era of phpMyAdmin together with Olivier Müller and Loïc Chapeaux @@ -62,6 +62,19 @@ He lives in <span class="adr"><span class="locality">Groningen</span>, <span cla </p> </div> +<div class="floatbox vcard" id="dieter"> +<h3 class="fn">Dieter Adriaenssens</h3> + +<img class="head photo" src="${server}${base_url}images/heads/dieter.jpg" alt="Photo of Dieter Adriaenssens" /> +<p> +Dieter joined the development team in March 2010, and so far has +contributed to the project by submitting bug fixes. +</p> +<p> +He currently lives in <span class="adr"><span class="locality">Gent</span>, <span class="country-name">Belgium</span></span>. +</p> +</div> + <div class="clearer"></div> <h2>Team meetings</h2> hooks/post-receive -- phpMyAdmin website

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin website branch, master, updated. 34489a217cf5b4b79300b57b5f5d08d7c3ef2498
by Michal Čihař 12 Dec '10

12 Dec '10

The branch, master has been updated via 34489a217cf5b4b79300b57b5f5d08d7c3ef2498 (commit) from 0b5e8530c4719ed74d902d204753a6e7f558f401 (commit) - Log ----------------------------------------------------------------- commit 34489a217cf5b4b79300b57b5f5d08d7c3ef2498 Author: Michal Čihař <michal(a)cihar.com> Date: Sun Dec 12 23:12:56 2010 +0100 Update flattr link here as well ----------------------------------------------------------------------- Summary of changes: templates/donate.tpl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/templates/donate.tpl b/templates/donate.tpl index 9efd06f..acab3e3 100644 --- a/templates/donate.tpl +++ b/templates/donate.tpl @@ -10,7 +10,7 @@ We invite you to <a href="https://sourceforge.net/donate/index.php?group_id=23067" rel="payment">contribute money</a> to our project (or just send money using PayPal to donate(a)phpmyadmin.net). </p> <p> -Alternatively you can appreciate our work using <a href="https://flattr.com/thing/56976/phpMyAdmin">Flattr</a>. +Alternatively you can appreciate our work using <a href="https://flattr.com/thing/98525/phpMyAdmin">Flattr</a>. </p> <p> Donations will be used for the promotion of phpMyAdmin, mostly by allowing team members to visit various conferences. Thanks. hooks/post-receive -- phpMyAdmin website

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin website branch, master, updated. 0b5e8530c4719ed74d902d204753a6e7f558f401
by Michal Čihař 12 Dec '10

12 Dec '10

The branch, master has been updated via 0b5e8530c4719ed74d902d204753a6e7f558f401 (commit) from f404f682583a107dd4d836a94ca86ca675719be3 (commit) - Log ----------------------------------------------------------------- commit 0b5e8530c4719ed74d902d204753a6e7f558f401 Author: Michal Čihař <michal(a)cihar.com> Date: Sun Dec 12 23:08:48 2010 +0100 Revert "Switch to static flattr code." This reverts commit f404f682583a107dd4d836a94ca86ca675719be3. Okay, the js version seems to work in the end... ----------------------------------------------------------------------- Summary of changes: templates/_page.tpl | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/templates/_page.tpl b/templates/_page.tpl index 339b925..398faf5 100644 --- a/templates/_page.tpl +++ b/templates/_page.tpl @@ -25,6 +25,19 @@ <meta http-equiv="X-Generated" content="${generated}" /> <meta name="verify-v1" content="3AM2eNj0zQ1Ao/N2eGE02S45V3p5KQxAyMIxdUJhtEQ=" /> <meta name="robots" content="index, follow" /> +<script type="text/javascript"> +/* <![CDATA[ */ + (function() { + var s = document.createElement('script'), t = document.getElementsByTagName('script')[0]; + + s.type = 'text/javascript'; + s.async = true; + s.src = 'http://api.flattr.com/js/0.6/load.js?mode=auto'; + + t.parentNode.insertBefore(s, t); + })(); +/* ]]> */ +</script> </head> <body> <div id="header"> @@ -46,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 href="http://flattr.com/thing/98525/phpMyAdmin" target="_blank"><img src="http://api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" title="Flattr this" border="0" /></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."); hooks/post-receive -- phpMyAdmin website

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin website branch, master, updated. f404f682583a107dd4d836a94ca86ca675719be3
by Michal Čihař 12 Dec '10

12 Dec '10

The branch, master has been updated via f404f682583a107dd4d836a94ca86ca675719be3 (commit) from 0fbabb58b8b5586faba37231570f4ff3d23b6343 (commit) - Log ----------------------------------------------------------------- commit f404f682583a107dd4d836a94ca86ca675719be3 Author: Michal Čihař <michal(a)cihar.com> Date: Sun Dec 12 23:03:06 2010 +0100 Switch to static flattr code. ----------------------------------------------------------------------- Summary of changes: templates/_page.tpl | 15 +-------------- 1 files changed, 1 insertions(+), 14 deletions(-) diff --git a/templates/_page.tpl b/templates/_page.tpl index 398faf5..339b925 100644 --- a/templates/_page.tpl +++ b/templates/_page.tpl @@ -25,19 +25,6 @@ <meta http-equiv="X-Generated" content="${generated}" /> <meta name="verify-v1" content="3AM2eNj0zQ1Ao/N2eGE02S45V3p5KQxAyMIxdUJhtEQ=" /> <meta name="robots" content="index, follow" /> -<script type="text/javascript"> -/* <![CDATA[ */ - (function() { - var s = document.createElement('script'), t = document.getElementsByTagName('script')[0]; - - s.type = 'text/javascript'; - s.async = true; - s.src = 'http://api.flattr.com/js/0.6/load.js?mode=auto'; - - t.parentNode.insertBefore(s, t); - })(); -/* ]]> */ -</script> </head> <body> <div id="header"> @@ -59,7 +46,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 href="http://flattr.com/thing/98525/phpMyAdmin" target="_blank"><img src="http://api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" title="Flattr this" border="0" /></a></li> </ul> <script type="text/javascript"> var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www."); hooks/post-receive -- phpMyAdmin website

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git