- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA3-127-g494ad67
by Marc Delisle 15 Feb '11

15 Feb '11

The branch, master has been updated via 494ad67e78d2a97590a2435e54202ca6dc6d9ef8 (commit) from 651b357f8a2d756e4e3f978c9b78750bcc44d0f5 (commit) - Log ----------------------------------------------------------------- commit 494ad67e78d2a97590a2435e54202ca6dc6d9ef8 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Feb 15 12:29:24 2011 -0500 Undefined variables when nothing is uploaded into a BLOB column ----------------------------------------------------------------------- Summary of changes: libraries/File.class.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libraries/File.class.php b/libraries/File.class.php index 378b25d..4fd3342 100644 --- a/libraries/File.class.php +++ b/libraries/File.class.php @@ -265,7 +265,7 @@ class PMA_File */ function setUploadedFromTblChangeRequest($key, $rownumber) { - if (! isset($_FILES['fields_upload']) && ! isset($_FILES['fields_upload']['name']['multi_edit'][$rownumber][$key])) { + if (! isset($_FILES['fields_upload']) || empty($_FILES['fields_upload']['name']['multi_edit'][$rownumber][$key])) { return false; } $file = PMA_File::fetchUploadedFromTblChangeRequestMultiple($_FILES['fields_upload'], $rownumber, $key); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA3-126-g651b357
by Piotr Przybylski 15 Feb '11

15 Feb '11

The branch, master has been updated via 651b357f8a2d756e4e3f978c9b78750bcc44d0f5 (commit) from e5e21be62a5c9922134e23f8d78da72fadda8d52 (commit) - Log ----------------------------------------------------------------- commit 651b357f8a2d756e4e3f978c9b78750bcc44d0f5 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Tue Feb 15 17:33:48 2011 +0100 Whitespace cleanup ----------------------------------------------------------------------- Summary of changes: libraries/dbi/mysql.dbi.lib.php | 16 ++++++------ libraries/dbi/mysqli.dbi.lib.php | 52 +++++++++++++++++++------------------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/libraries/dbi/mysql.dbi.lib.php b/libraries/dbi/mysql.dbi.lib.php index 2ddd765..c4f22fb 100644 --- a/libraries/dbi/mysql.dbi.lib.php +++ b/libraries/dbi/mysql.dbi.lib.php @@ -63,12 +63,12 @@ function PMA_DBI_connect($user, $password, $is_controluser = false, $server = nu ? false : true; } else { - $server_port = (empty($cfg['Server']['port'])) - ? '' - : ':' . (int)$cfg['Server']['port']; - $server_socket = (empty($cfg['Server']['socket'])) - ? '' - : ':' . $cfg['Server']['socket']; + $server_port = (empty($cfg['Server']['port'])) + ? '' + : ':' . (int)$cfg['Server']['port']; + $server_socket = (empty($cfg['Server']['socket'])) + ? '' + : ':' . $cfg['Server']['socket']; } if (strtolower($cfg['Server']['connect_type']) == 'tcp') { @@ -97,11 +97,11 @@ function PMA_DBI_connect($user, $password, $is_controluser = false, $server = nu // Retry with empty password if we're allowed to if (empty($link) && $cfg['Server']['nopassword'] && !$is_controluser) { - $link = PMA_DBI_real_connect($cfg['Server']['host'] . $server_port . $server_socket, $user, '', empty($client_flags) ? NULL : $client_flags); + $link = PMA_DBI_real_connect($cfg['Server']['host'] . $server_port . $server_socket, $user, '', empty($client_flags) ? NULL : $client_flags); } } else { if (!isset($server['host'])) { - $link = PMA_DBI_real_connect($server_socket, $user, $password, NULL, $server_persistant); + $link = PMA_DBI_real_connect($server_socket, $user, $password, NULL, $server_persistant); } else { $link = PMA_DBI_real_connect($server['host'] . $server_port . $server_socket, $user, $password, NULL, $server_persistant); } diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php index 71693ab..a6eff91 100644 --- a/libraries/dbi/mysqli.dbi.lib.php +++ b/libraries/dbi/mysqli.dbi.lib.php @@ -66,22 +66,22 @@ if (! defined('MYSQLI_TYPE_BIT')) { function PMA_DBI_connect($user, $password, $is_controluser = false, $server = null, $auxiliary_connection = false) { if ($server) { - $server_port = (empty($server['port'])) - ? false - : (int)$server['port']; - $server_socket = (empty($server['socket'])) - ? '' - : $server['socket']; - $server['host'] = (empty($server['host'])) - ? 'localhost' - : $server['host']; + $server_port = (empty($server['port'])) + ? false + : (int)$server['port']; + $server_socket = (empty($server['socket'])) + ? '' + : $server['socket']; + $server['host'] = (empty($server['host'])) + ? 'localhost' + : $server['host']; } else { - $server_port = (empty($GLOBALS['cfg']['Server']['port'])) - ? false - : (int) $GLOBALS['cfg']['Server']['port']; - $server_socket = (empty($GLOBALS['cfg']['Server']['socket'])) - ? null - : $GLOBALS['cfg']['Server']['socket']; + $server_port = (empty($GLOBALS['cfg']['Server']['port'])) + ? false + : (int) $GLOBALS['cfg']['Server']['port']; + $server_socket = (empty($GLOBALS['cfg']['Server']['socket'])) + ? null + : $GLOBALS['cfg']['Server']['socket']; } @@ -108,25 +108,25 @@ function PMA_DBI_connect($user, $password, $is_controluser = false, $server = nu } if (!$server) { - $return_value = @mysqli_real_connect($link, $GLOBALS['cfg']['Server']['host'], $user, $password, false, $server_port, $server_socket, $client_flags); - // Retry with empty password if we're allowed to - if ($return_value == false && isset($GLOBALS['cfg']['Server']['nopassword']) && $GLOBALS['cfg']['Server']['nopassword'] && !$is_controluser) { - $return_value = @mysqli_real_connect($link, $GLOBALS['cfg']['Server']['host'], $user, '', false, $server_port, $server_socket, $client_flags); - } + $return_value = @mysqli_real_connect($link, $GLOBALS['cfg']['Server']['host'], $user, $password, false, $server_port, $server_socket, $client_flags); + // Retry with empty password if we're allowed to + if ($return_value == false && isset($GLOBALS['cfg']['Server']['nopassword']) && $GLOBALS['cfg']['Server']['nopassword'] && !$is_controluser) { + $return_value = @mysqli_real_connect($link, $GLOBALS['cfg']['Server']['host'], $user, '', false, $server_port, $server_socket, $client_flags); + } } else { - $return_value = @mysqli_real_connect($link, $server['host'], $user, $password, false, $server_port, $server_socket); + $return_value = @mysqli_real_connect($link, $server['host'], $user, $password, false, $server_port, $server_socket); } if ($return_value == false) { - if ($is_controluser) { - trigger_error(__('Connection for controluser as defined in your configuration failed.'), E_USER_WARNING); - return false; - } + if ($is_controluser) { + trigger_error(__('Connection for controluser as defined in your configuration failed.'), E_USER_WARNING); + return false; + } // we could be calling PMA_DBI_connect() to connect to another // server, for example in the Synchronize feature, so do not // go back to main login if it fails if (! $auxiliary_connection) { - PMA_log_user($user, 'mysql-denied'); + PMA_log_user($user, 'mysql-denied'); PMA_auth_fails(); } else { return false; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin themes branch, master, updated. bd33e411871729796cefc73881eba6d0d2bb06ce
by Michal Čihař 15 Feb '11

15 Feb '11

The branch, master has been updated via bd33e411871729796cefc73881eba6d0d2bb06ce (commit) via 959d214bdf1047b1e69c4828dfe2a349a91fcfdb (commit) from da4b73fced1630c760640ef873728cf53041e48f (commit) - Log ----------------------------------------------------------------- commit bd33e411871729796cefc73881eba6d0d2bb06ce Merge: da4b73fced1630c760640ef873728cf53041e48f 959d214bdf1047b1e69c4828dfe2a349a91fcfdb Author: Michal Čihař <mcihar(a)novell.com> Date: Tue Feb 15 09:29:36 2011 +0100 Merge remote branch 'toba/master' commit 959d214bdf1047b1e69c4828dfe2a349a91fcfdb Author: Azhari Harahap <blackarazi(a)gmail.com> Date: Sun Feb 13 22:55:13 2011 +0700 topmenu hover fix, left frame icon fix, submenu/topmenu2 fix, table header on insert color fix ----------------------------------------------------------------------- Summary of changes: toba/css/theme_left.css.php | 6 +++++- toba/css/theme_right.css.php | 33 ++++++++++++++++++++------------- 2 files changed, 25 insertions(+), 14 deletions(-) diff --git a/toba/css/theme_left.css.php b/toba/css/theme_left.css.php index 488df06..1c24d51 100644 --- a/toba/css/theme_left.css.php +++ b/toba/css/theme_left.css.php @@ -169,7 +169,11 @@ div#leftframelinks a img.icon { margin: 0; padding: 0.2em; border: 0.1em solid <?php echo $GLOBALS['cfg']['NaviColor']; ?>; - background: <?php echo $GLOBALS['cfg']['ThBackground']; ?>; + background: <?php echo $GLOBALS['cfg']['BgTwo']; ?>; +} + +div#leftframelinks a img.icon:hover { + background: <?php echo $GLOBALS['cfg']['BgOne']; ?>; } /* serverlist */ diff --git a/toba/css/theme_right.css.php b/toba/css/theme_right.css.php index f3f134a..6b9366d 100644 --- a/toba/css/theme_right.css.php +++ b/toba/css/theme_right.css.php @@ -652,9 +652,9 @@ ul#topmenu, ul#topmenu2, ul.tabs { } ul#topmenu2 { - margin: 0.25em 0.5em 0; - height: 2em; - clear: both; + margin: 0; + background: <?php echo $GLOBALS['cfg']['TopMenuBgColor']; ?>; + border-top: 3px solid <?php echo $GLOBALS['cfg']['LabelColor']; ?>; } ul#topmenu li, ul#topmenu2 li { @@ -665,6 +665,11 @@ ul#topmenu li, ul#topmenu2 li { border-right: 1px solid #333; } +ul#topmenu2 li { + padding: 0 3px; + border: none; +} + #topmenu img, #topmenu2 img { vertical-align: middle; margin-<?php echo $right; ?>: 0.1em; @@ -723,14 +728,14 @@ ul#topmenu span.tabcaution { color: #ff6666; } -/* enabled drop/empty tabs */ +/* enabled drop/empty tabs ul#topmenu a.tabcaution { color: #FF0000; } ul#topmenu a.tabcaution:hover { color: #FFFFFF; background-color: #FF0000; -} +}*/ fieldset.caution a { color: #FF0000; } @@ -770,9 +775,10 @@ ul#topmenu > li { ul#topmenu a, ul#topmenu span { background-color: <?php echo $GLOBALS['cfg']['TopMenuBgColor']; ?>; padding: 5px; + margin: 0; /*border: 0px solid <?php echo $GLOBALS['cfg']['BgTwo']; ?>; - border-width: 1pt 1pt 0 1pt;*/ - /*-moz-border-radius: 0.4em 0.4em 0 0; + border-width: 1pt 1pt 0 1pt; + -moz-border-radius: 0.4em 0.4em 0 0; border-radius: 0.4em 0.4em 0 0;*/ } @@ -789,8 +795,7 @@ ul#topmenu ul li:first-child a { /* enabled hover/active tabs */ ul#topmenu > li > a:hover, ul#topmenu > li > .tabactive { - margin: 0; - /*padding: 0.2em 0.4em 0.2em 0.4em;*/ + padding: 5px; text-decoration: none; } @@ -802,7 +807,7 @@ ul#topmenu ul .tabactive { ul#topmenu a.tab:hover, ul#topmenu .tabactive { background-color: <?php echo $GLOBALS['cfg']['MainBackground']; ?>; - /*padding: 5px;*/ + padding: 5px; } ul#topmenu2 a.tab:hover, @@ -1610,6 +1615,8 @@ iframe.IE_hack { } .config-form ul.tabs li { + background: <?php echo $GLOBALS['cfg']['BgOne']; ?>; + border: 1px solid <?php echo $GLOBALS['cfg']['LabelColor']; ?>; float: <?php echo $left; ?>; } @@ -1619,7 +1626,6 @@ iframe.IE_hack { padding: 0.1em 0.4em; white-space: nowrap; text-decoration: none; - border: 1px solid <?php echo $GLOBALS['cfg']['BgTwo']; ?>; border-bottom: none; } @@ -1631,7 +1637,8 @@ iframe.IE_hack { } .config-form ul.tabs li a.active { - background-color: <?php echo $GLOBALS['cfg']['BgOne']; ?>; + background-color: <?php echo $GLOBALS['cfg']['HeaderBackground']; ?>; + color: <?php echo $GLOBALS['cfg']['TblContentBackground']; ?> } .config-form fieldset { @@ -1835,7 +1842,7 @@ table.data { margin: 0 5px 5px 0; } -table.data thead a { +table.data thead a, table.insertRowTable thead a { color: <?php echo $GLOBALS['cfg']['TableHeaderlinkColor'];?>; /*font-weight: normal;*/ } hooks/post-receive -- phpMyAdmin themes

1 0

[Phpmyadmin-git] Notifications not working
by Michal Čihař 09 Feb '11

09 Feb '11

Hi all the notifications about new commits are currently not working due to some problems on sf.net servers. -- Michal Čihař | http://cihar.com | http://phpmyadmin.cz

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-2075-g18f898e
by Michal Čihař 09 Feb '11

09 Feb '11

The branch, master has been updated via 18f898eb1b5d998091bf8ffbb3c2b86fcf3f2c31 (commit) from 6fb8505721429ca17996d8264403f333591b9cb2 (commit) - Log ----------------------------------------------------------------- commit 18f898eb1b5d998091bf8ffbb3c2b86fcf3f2c31 Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Feb 9 14:40:21 2011 +0100 Czech translation update ----------------------------------------------------------------------- Summary of changes: po/cs.po | 53 ++++++++++++++++++++++++++--------------------------- 1 files changed, 26 insertions(+), 27 deletions(-) diff --git a/po/cs.po b/po/cs.po index e7f6f47..0ec7c1f 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-beta3-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-02-09 07:56-0500\n" -"PO-Revision-Date: 2011-02-08 17:10+0100\n" +"PO-Revision-Date: 2011-02-09 14:40+0100\n" "Last-Translator: Michal Čihař <michal(a)cihar.com>\n" "Language-Team: czech <cs(a)li.org>\n" "MIME-Version: 1.0\n" @@ -627,8 +627,8 @@ msgstr "Sledování není zapnuté." #: db_structure.php:379 libraries/display_tbl.lib.php:1952 #, php-format msgid "" -"This view has at least this number of rows. Please refer to %sdocumentation%" -"s." +"This view has at least this number of rows. Please refer to %sdocumentation" +"%s." msgstr "" "Tento pohled má alespoň tolik řádek. Podrobnosti naleznete v %sdokumentaci%s." @@ -863,8 +863,8 @@ msgstr "Výpis byl uložen do souboru %s." #: import.php:58 #, php-format msgid "" -"You probably tried to upload too large file. Please refer to %sdocumentation%" -"s for ways to workaround this limit." +"You probably tried to upload too large file. Please refer to %sdocumentation" +"%s for ways to workaround this limit." msgstr "" "Pravděpodobně jste se pokusili nahrát příliš velký soubor. Přečtěte si " "prosím %sdokumentaci%s, jak toto omezení obejít." @@ -1644,8 +1644,8 @@ msgstr "Vítejte v %s" #: libraries/auth/config.auth.lib.php:106 #, php-format msgid "" -"You probably did not create a configuration file. You might want to use the %" -"1$ssetup script%2$s to create one." +"You probably did not create a configuration file. You might want to use the " +"%1$ssetup script%2$s to create one." msgstr "" "Pravděpodobná příčina je, že nemáte vytvořený konfigurační soubor. Pro jeho " "vytvoření by se vám mohl hodit %1$snastavovací skript%2$s." @@ -3393,17 +3393,16 @@ msgstr "Omezení paměti" #: libraries/config/messages.inc.php:314 msgid "These are Edit, Inline edit, Copy and Delete links" -msgstr "" +msgstr "Jedná se o odkazy Upravit, Upravit zde, Kopírovat a Odstranit" #: libraries/config/messages.inc.php:315 -#, fuzzy #| msgid "Show logo in left frame" msgid "Show table row links on left side" -msgstr "Zobrazí logo v levém rámu" +msgstr "Zobrazí odkazy na levé straně" #: libraries/config/messages.inc.php:316 msgid "Show table row links on right side" -msgstr "" +msgstr "Zobrazí odkazy na pravé straně" #: libraries/config/messages.inc.php:317 msgid "Use natural order for sorting table and database names" @@ -4611,8 +4610,8 @@ msgstr ", @TABLE@ bude nahrazen jménem tabulky" #, php-format msgid "" "This value is interpreted using %1$sstrftime%2$s, so you can use time " -"formatting strings. Additionally the following transformations will happen: %" -"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details." +"formatting strings. Additionally the following transformations will happen: " +"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details." msgstr "" "Tato hodnota je interpretována pomocí %1$sstrftime%2$s, takže můžete použít " "libovolné řetězce pro formátování data a času. Dále budou provedena " @@ -5344,8 +5343,8 @@ msgstr "" #: libraries/engines/pbxt.lib.php:125 #, php-format msgid "" -"Documentation and further information about PBXT can be found on the %" -"sPrimeBase XT Home Page%s." +"Documentation and further information about PBXT can be found on the " +"%sPrimeBase XT Home Page%s." msgstr "" "Dokumentace a další informace o PBXT můžete nalézt na %sstránkách PrimeBase " "XT%s." @@ -6598,8 +6597,8 @@ msgid "" "For a list of available transformation options and their MIME type " "transformations, click on %stransformation descriptions%s" msgstr "" -"Pro seznam dostupných parametrů transformací a jejich MIME typů klikněte na %" -"spopisy transformací%s" +"Pro seznam dostupných parametrů transformací a jejich MIME typů klikněte na " +"%spopisy transformací%s" #: libraries/tbl_properties.inc.php:143 msgid "Transformation options" @@ -6640,8 +6639,8 @@ msgid "" "No description is available for this transformation. Please ask the " "author what %s does." msgstr "" -"Pro tuto transformaci není dostupný žádný popis. Zeptejte se autora co %" -"s dělá." +"Pro tuto transformaci není dostupný žádný popis. Zeptejte se autora co " +"%s dělá." #: libraries/tbl_properties.inc.php:727 server_engines.php:56 #: tbl_operations.php:352 @@ -7272,8 +7271,8 @@ msgid "" "You can set more settings by modifying config.inc.php, eg. by using %sSetup " "script%s." msgstr "" -"Více věcí můžete nastavit úpravou config.inc.php, např. použitím %" -"sNastavovacího skriptu%s." +"Více věcí můžete nastavit úpravou config.inc.php, např. použitím " +"%sNastavovacího skriptu%s." #: prefs_manage.php:302 msgid "Save to browser's storage" @@ -7721,8 +7720,8 @@ msgstr "Odstranit databáze se stejnými jmény jako uživatelé." msgid "" "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege " "tables. The content of these tables may differ from the privileges the " -"server uses, if they have been changed manually. In this case, you should %" -"sreload the privileges%s before you continue." +"server uses, if they have been changed manually. In this case, you should " +"%sreload the privileges%s before you continue." msgstr "" "Poznámka: phpMyAdmin získává oprávnění přímo z tabulek MySQL. Obsah těchto " "tabulek se může lišit od oprávnění, která server právě používá, pokud byly " @@ -9177,8 +9176,8 @@ msgid "" "If using cookie authentication and %sLogin cookie store%s is not 0, %sLogin " "cookie validity%s must be set to a value less or equal to it." msgstr "" -"Při použití přihlašování přes cookies a při %sUkládádání přihlašovaci cookie%" -"s vyšší než 0 musí být %sPlatnost přihlašovací cookie%s nastavena na vyšší " +"Při použití přihlašování přes cookies a při %sUkládádání přihlašovaci cookie" +"%s vyšší než 0 musí být %sPlatnost přihlašovací cookie%s nastavena na vyšší " "hodnotu než je tato." #: setup/lib/index.lib.php:266 @@ -9189,8 +9188,8 @@ msgid "" "protection may not be reliable if your IP belongs to an ISP where thousands " "of users, including you, are connected to." msgstr "" -"Pokud to považujete za nutné, použijte další možnosti zabezpečení - %" -"somezení počítačů%s a %sseznam důvěryhodných proxy%s. Nicméně zabezpečení " +"Pokud to považujete za nutné, použijte další možnosti zabezpečení - " +"%somezení počítačů%s a %sseznam důvěryhodných proxy%s. Nicméně zabezpečení " "založené na IP adresách nemusí být spolehlivé, pokud je vaše IP adresa " "dynamicky přidělována poskytovatelem spolu s mnoha dalšími uživateli." hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-2074-g6fb8505
by Michal Čihař 09 Feb '11

09 Feb '11

The branch, master has been updated via 6fb8505721429ca17996d8264403f333591b9cb2 (commit) from e13b41a555cc556362ce56e61cfa53cd2dbda5e7 (commit) - Log ----------------------------------------------------------------- commit 6fb8505721429ca17996d8264403f333591b9cb2 Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Feb 9 13:55:25 2011 +0100 Use correct type when storing preferences. We should not use the value, but the key. Value stores descriptions, while key is actually the thing stored in settings. ----------------------------------------------------------------------- Summary of changes: libraries/config/FormDisplay.class.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libraries/config/FormDisplay.class.php b/libraries/config/FormDisplay.class.php index 41c421f..9e84075 100644 --- a/libraries/config/FormDisplay.class.php +++ b/libraries/config/FormDisplay.class.php @@ -468,7 +468,7 @@ class FormDisplay // (allows to skip 0 == 'string' equalling to true) or identity (for string-string) if (($vk == $value && !(is_numeric($value_cmp) xor is_numeric($vk))) || $vk === $value) { - settype($value, gettype($v)); + settype($value, gettype($vk)); return true; } } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-2072-g67d23c0
by Marc Delisle 09 Feb '11

09 Feb '11

The branch, master has been updated via 67d23c0c160b6087ff1546725b61c5bdca4930d2 (commit) from 0004198bca8147c751c08638c9927e9794e6b099 (commit) - Log ----------------------------------------------------------------- commit 67d23c0c160b6087ff1546725b61c5bdca4930d2 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Feb 9 07:55:38 2011 -0500 Clarify the meaning of these directives ----------------------------------------------------------------------- Summary of changes: Documentation.html | 3 ++- libraries/config/messages.inc.php | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Documentation.html b/Documentation.html index 58e1f92..fc374d0 100644 --- a/Documentation.html +++ b/Documentation.html @@ -1884,7 +1884,8 @@ $cfg['TrustedProxies'] = <dt>$cfg['ModifyDeleteAtLeft'] boolean $cfg['ModifyDeleteAtRight'] boolean </dt> - <dd>Defines the place where modify and delete links would be put when + <dd>Defines the place where table row links (Edit, Inline edit, Copy, + Delete) would be put when tables contents are displayed (you may have them displayed both at the left and at the right). "Left" and "right" are parsed as "top" diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php index b2363c1..9ebbfea 100644 --- a/libraries/config/messages.inc.php +++ b/libraries/config/messages.inc.php @@ -311,8 +311,9 @@ $strConfigMcryptDisableWarning_desc = __('Disable the default warning that is di $strConfigMcryptDisableWarning_name = __('mcrypt warning'); $strConfigMemoryLimit_desc = __('The number of bytes a script is allowed to allocate, eg. [kbd]32M[/kbd] ([kbd]0[/kbd] for no limit)'); $strConfigMemoryLimit_name = __('Memory limit'); -$strConfigModifyDeleteAtLeft_name = __('Show left delete link'); -$strConfigModifyDeleteAtRight_name = __('Show right delete link'); +$strConfigModifyDeleteAtLeft_desc = __('These are Edit, Inline edit, Copy and Delete links'); +$strConfigModifyDeleteAtLeft_name = __('Show table row links on left side'); +$strConfigModifyDeleteAtRight_name = __('Show table row links on right side'); $strConfigNaturalOrder_desc = __('Use natural order for sorting table and database names'); $strConfigNaturalOrder_name = __('Natural order'); $strConfigNavigationBarIconic_desc = __('Use only icons, only text or both'); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-2071-g0004198
by Marc Delisle 09 Feb '11

09 Feb '11

The branch, master has been updated via 0004198bca8147c751c08638c9927e9794e6b099 (commit) from d0e1776af64acc185ab3a1260fc50d7bb7b98e6c (commit) - Log ----------------------------------------------------------------- commit 0004198bca8147c751c08638c9927e9794e6b099 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Feb 9 05:58:49 2011 -0500 The PropertiesIconic preference is not related to Tabs but to Browse mode ----------------------------------------------------------------------- Summary of changes: libraries/config/user_preferences.forms.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libraries/config/user_preferences.forms.php b/libraries/config/user_preferences.forms.php index ea5ac59..d23edda 100644 --- a/libraries/config/user_preferences.forms.php +++ b/libraries/config/user_preferences.forms.php @@ -99,6 +99,7 @@ $forms['Main_frame']['Startup'] = array( 'ShowServerInfo'); $forms['Main_frame']['Browse'] = array( 'NavigationBarIconic', + 'PropertiesIconic', 'ShowAll', 'MaxRows', 'Order', @@ -120,7 +121,6 @@ $forms['Main_frame']['Edit'] = array( 'DefaultPropDisplay'); $forms['Main_frame']['Tabs'] = array( 'LightTabs', - 'PropertiesIconic', 'DefaultTabServer', 'DefaultTabDatabase', 'DefaultTabTable'); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-2070-gd0e1776
by Marc Delisle 09 Feb '11

09 Feb '11

The branch, master has been updated via d0e1776af64acc185ab3a1260fc50d7bb7b98e6c (commit) from dcc3eafd1275c6433b1289cf8bc8ecd9be3285e2 (commit) - Log ----------------------------------------------------------------- commit d0e1776af64acc185ab3a1260fc50d7bb7b98e6c Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Feb 9 05:52:16 2011 -0500 Correctly handle the ENUM editor message in case a column is added Add PMA_ prefix to function name ----------------------------------------------------------------------- Summary of changes: js/functions.js | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/js/functions.js b/js/functions.js index c1a6b26..07c6237 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1556,7 +1556,7 @@ function PMA_ajaxShowMessage(message, timeout) { /** * Hides/shows the "Open in ENUM/SET editor" message, depending on the data type of the column currently selected */ -function showNoticeForEnum(selectElement) { +function PMA_showNoticeForEnum(selectElement) { var enum_notice_id = selectElement.attr("id").split("_")[1]; enum_notice_id += "_" + (parseInt(selectElement.attr("id").split("_")[2]) + 1); var selectedType = selectElement.attr("value"); @@ -1832,6 +1832,7 @@ $(document).ready(function() { if ($("#create_table_div").length > 0) { $("#create_table_div").html(data); } + PMA_verifyTypeOfAllColumns(); }) //end $.post() }) // end create table form (add fields) @@ -2041,13 +2042,13 @@ $(document).ready(function() { // // needs live() to work also in the Create Table dialog $("select[class='column_type']").live('change', function() { - showNoticeForEnum($(this)); + PMA_showNoticeForEnum($(this)); }); }); function PMA_verifyTypeOfAllColumns() { $("select[class='column_type']").each(function() { - showNoticeForEnum($(this)); + PMA_showNoticeForEnum($(this)); }); } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-2069-gdcc3eaf
by Michal Čihař 09 Feb '11

09 Feb '11

The branch, master has been updated via dcc3eafd1275c6433b1289cf8bc8ecd9be3285e2 (commit) via e53b972378b1f1fd186991a7d9ae10344bd80926 (commit) via 5dc016d445fe79c03e6ebbf0c8247d447c4f9af4 (commit) from 510f32714ae1c42d24bc2849518cade6b116e8d4 (commit) - Log ----------------------------------------------------------------- commit dcc3eafd1275c6433b1289cf8bc8ecd9be3285e2 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Wed Feb 9 12:16:23 2011 +0200 Translation update done using Pootle. commit e53b972378b1f1fd186991a7d9ae10344bd80926 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Wed Feb 9 12:16:04 2011 +0200 Translation update done using Pootle. commit 5dc016d445fe79c03e6ebbf0c8247d447c4f9af4 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Wed Feb 9 12:15:54 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/tr.po | 27 ++++----------------------- 1 files changed, 4 insertions(+), 23 deletions(-) diff --git a/po/tr.po b/po/tr.po index e78cbe9..68d4368 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-beta3-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-02-08 17:09+0100\n" -"PO-Revision-Date: 2011-02-08 19:00+0200\n" +"PO-Revision-Date: 2011-02-09 12:16+0200\n" "Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n" "Language-Team: turkish <tr(a)li.org>\n" "Language: tr\n" @@ -6934,22 +6934,19 @@ msgid "Official Homepage" msgstr "Resmî phpMyAdmin Anasayfası" #: main.php:227 -#, fuzzy #| msgid "Attributes" msgid "Contribute" -msgstr "Öznitelikler" +msgstr "Katkıda bulun" #: main.php:228 -#, fuzzy #| msgid "Replication support" msgid "Get support" -msgstr "Çoğaltma desteği" +msgstr "Destek al" #: main.php:229 -#, fuzzy #| msgid "No change" msgid "List of changes" -msgstr "Değişiklik yok" +msgstr "Değişikliklerin listesi" #: main.php:253 msgid "" @@ -10035,19 +10032,3 @@ msgstr "Görünümü yeniden şuna adlandır" #~ msgid "Mailing lists" #~ msgstr "Postalama listesi" - -#, fuzzy -#~| msgid "Yes" -#~ msgid "yes" -#~ msgstr "Evet" - -#, fuzzy -#~| msgid "Close" -#~ msgid "closed" -#~ msgstr "Kapat" - -#~ msgid "to/from page" -#~ msgstr "sayfadan/sayfaya" - -#~ msgid "Disable Statistics" -#~ msgstr "İstatistikler etkisiz" hooks/post-receive -- phpMyAdmin

1 0