August 2011 - Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_4-17287-gfb58204
by Dieter Adriaenssens 25 Aug '11

25 Aug '11

The branch, master has been updated via fb5820487ca57f12b8a9a1b9ea21ecfeff12607e (commit) from 04772d6d8f6c8857b2cb4d2ea74045a7bacd123f (commit) - Log ----------------------------------------------------------------- commit fb5820487ca57f12b8a9a1b9ea21ecfeff12607e Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: Thu Aug 25 21:44:04 2011 +0200 try indentation ----------------------------------------------------------------------- Summary of changes: libraries/Config.class.php | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 7beb4cc..b0d85a9 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -179,16 +179,18 @@ class PMA_Config // (must check everything else before Mozilla) if (preg_match( - '@Opera(/| )([0-9].[0-9]{1,2})@', - $HTTP_USER_AGENT, - $log_version) + '@Opera(/| )([0-9].[0-9]{1,2})@', + $HTTP_USER_AGENT, + $log_version + ) ) { $this->set('PMA_USR_BROWSER_VER', $log_version[2]); $this->set('PMA_USR_BROWSER_AGENT', 'OPERA'); } elseif (preg_match( - '@MSIE ([0-9].[0-9]{1,2})@', - $HTTP_USER_AGENT, - $log_version) + '@MSIE ([0-9].[0-9]{1,2})@', + $HTTP_USER_AGENT, + $log_version + ) ) { $this->set('PMA_USR_BROWSER_VER', $log_version[1]); $this->set('PMA_USR_BROWSER_AGENT', 'IE'); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_4-17286-g04772d6
by Dieter Adriaenssens 25 Aug '11

25 Aug '11

The branch, master has been updated via 04772d6d8f6c8857b2cb4d2ea74045a7bacd123f (commit) from 989d6b4f23ea37cfaa5ca8ab665c90a61db85ba6 (commit) - Log ----------------------------------------------------------------- commit 04772d6d8f6c8857b2cb4d2ea74045a7bacd123f Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: Thu Aug 25 19:35:25 2011 +0200 fix link ----------------------------------------------------------------------- Summary of changes: Documentation.html | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Documentation.html b/Documentation.html index 4e3d76b..dd70490 100644 --- a/Documentation.html +++ b/Documentation.html @@ -2835,7 +2835,7 @@ setfacl -d -m "g:www-data:rwx" tmp minor version since the one that is bundled with some PHP distributions is rather old and might cause problems <a href="#faq1_17a"> (see <abbr title="Frequently Asked Questions">FAQ</abbr> 1.17a)</a>.<br /><br /> - <a href="http://mariadb.org/"></a>MariaDB is also supported + <a href="http://mariadb.org/">MariaDB</a> is also supported (versions 5.1 and 5.2 were tested).<br /><br /> Since phpMyAdmin 3.5 <a href="http://www.drizzle.org/">Drizzle</a> is supported. </p> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_4-17285-g989d6b4
by Michal Čihař 25 Aug '11

25 Aug '11

The branch, master has been updated via 989d6b4f23ea37cfaa5ca8ab665c90a61db85ba6 (commit) via ccc7651837e1a03a6792b2c3cafa1199e1a4b19b (commit) via 527e8fe6bdbffee0b5769e6054f8e6980c39c4c8 (commit) via f751d943b14c81d4a8284b37f80468ec14ef0bf6 (commit) via 96f0c2e75b59ffd19049e42cd38857d56a57bbfd (commit) via 1a7d6af20424c45c019fd5930a3b7f8ed681c242 (commit) via 7e940e973fc11ad537449ffa0e8ff13bbb7d29e4 (commit) via 700c7fa3b8fd5f742316207af8b2d48a9080dcfe (commit) via 5f8bf7783a434590110e66afb016206d1f0c7a4d (commit) via 68a8066220e953933c688ced3eb40e9e2e3798ce (commit) via b905e6f94c5fbc6b8eb80b51ba6b01e5e9dc8cb5 (commit) via 8e0ebba66e04b1db135b4b77c72e8e0ed8e1286b (commit) via 239180935e4c94fc15c83491a6bc53b04abe0798 (commit) via d62f07257a2507a463d3f01521d3131cb9797b8d (commit) via 714ef1972db131ebf6aaff166fe847ac39bea8ad (commit) via 442eb9b67a8ef932e9411196507e518f532e06b5 (commit) via f81952af6649d1a873fedd69b3338c05a03431d1 (commit) via 3bdb698e4ff85f998fcd40cb6c51f2da8ae09e23 (commit) via 5db301020a22b854b79c5ffa944a667cfad7ab38 (commit) from 53f7ea521e39637c263cda8ecaa44bd0fdeab76c (commit) - Log ----------------------------------------------------------------- commit 989d6b4f23ea37cfaa5ca8ab665c90a61db85ba6 Merge: ccc7651 53f7ea5 Author: Pootle server <pootle(a)cihar.com> Date: Thu Aug 25 14:40:20 2011 +0200 Merge remote-tracking branch 'origin/master' commit ccc7651837e1a03a6792b2c3cafa1199e1a4b19b Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Thu Aug 25 13:28:54 2011 +0200 Translation update done using Pootle. commit 527e8fe6bdbffee0b5769e6054f8e6980c39c4c8 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Aug 25 13:26:59 2011 +0200 Translation update done using Pootle. commit f751d943b14c81d4a8284b37f80468ec14ef0bf6 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Aug 25 13:25:30 2011 +0200 Translation update done using Pootle. commit 96f0c2e75b59ffd19049e42cd38857d56a57bbfd Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Aug 25 13:25:24 2011 +0200 Translation update done using Pootle. commit 1a7d6af20424c45c019fd5930a3b7f8ed681c242 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Aug 25 13:25:19 2011 +0200 Translation update done using Pootle. commit 7e940e973fc11ad537449ffa0e8ff13bbb7d29e4 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Aug 25 13:25:13 2011 +0200 Translation update done using Pootle. commit 700c7fa3b8fd5f742316207af8b2d48a9080dcfe Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Aug 25 13:25:07 2011 +0200 Translation update done using Pootle. commit 5f8bf7783a434590110e66afb016206d1f0c7a4d Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Aug 25 13:25:00 2011 +0200 Translation update done using Pootle. commit 68a8066220e953933c688ced3eb40e9e2e3798ce Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Aug 25 13:24:54 2011 +0200 Translation update done using Pootle. commit b905e6f94c5fbc6b8eb80b51ba6b01e5e9dc8cb5 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Aug 25 13:23:41 2011 +0200 Translation update done using Pootle. commit 8e0ebba66e04b1db135b4b77c72e8e0ed8e1286b Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Aug 25 13:22:02 2011 +0200 Translation update done using Pootle. commit 239180935e4c94fc15c83491a6bc53b04abe0798 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Aug 25 13:21:42 2011 +0200 Translation update done using Pootle. commit d62f07257a2507a463d3f01521d3131cb9797b8d Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Aug 25 13:20:30 2011 +0200 Translation update done using Pootle. commit 714ef1972db131ebf6aaff166fe847ac39bea8ad Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Aug 25 13:20:15 2011 +0200 Translation update done using Pootle. commit 442eb9b67a8ef932e9411196507e518f532e06b5 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Aug 25 13:19:37 2011 +0200 Translation update done using Pootle. commit f81952af6649d1a873fedd69b3338c05a03431d1 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Thu Aug 25 12:15:52 2011 +0200 Translation update done using Pootle. commit 3bdb698e4ff85f998fcd40cb6c51f2da8ae09e23 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Aug 25 12:08:16 2011 +0200 Translation update done using Pootle. commit 5db301020a22b854b79c5ffa944a667cfad7ab38 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Aug 25 12:08:05 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/el.po | 8 +++++--- po/tr.po | 32 +++++++++++++++++--------------- 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/po/el.po b/po/el.po index 2d89b5e..f686860 100644 --- a/po/el.po +++ b/po/el.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-25 08:38+0200\n" -"PO-Revision-Date: 2011-08-23 08:34+0200\n" +"PO-Revision-Date: 2011-08-25 13:28+0200\n" "Last-Translator: Panagiotis Papazoglou <papaz_p(a)yahoo.com>\n" "Language-Team: greek <el(a)li.org>\n" "Language: el\n" @@ -885,10 +885,10 @@ msgstr "Υ" #: gis_data_editor.php:195 gis_data_editor.php:243 gis_data_editor.php:295 #: js/messages.php:289 -#, fuzzy, php-format +#, php-format #| msgid "Point" msgid "Point %d" -msgstr "Σημείο" +msgstr "Σημείο %d" #: gis_data_editor.php:204 gis_data_editor.php:250 gis_data_editor.php:302 #: js/messages.php:295 @@ -976,6 +976,8 @@ msgstr "" msgid "" "Cannot convert file's character set without character set conversion library" msgstr "" +"Αδύνατη η μετατροπή της κωδικοποίησης χωρίς τη βιβλιοθήκη μετατροπής " +"κωδικοποίησης" #: import.php:376 libraries/display_import.lib.php:23 msgid "Could not load import plugins, please check your installation!" diff --git a/po/tr.po b/po/tr.po index e33621b..29ef3d2 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-25 08:38+0200\n" -"PO-Revision-Date: 2011-08-25 12:06+0200\n" +"PO-Revision-Date: 2011-08-25 13:26+0200\n" "Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n" "Language-Team: turkish <tr(a)li.org>\n" "Language: tr\n" @@ -190,7 +190,7 @@ msgstr "Varsayılan" #: libraries/schema/Pdf_Relation_Schema.class.php:1316 #: libraries/schema/Pdf_Relation_Schema.class.php:1337 tbl_printview.php:144 msgid "Links to" -msgstr "Bağlantı verilen" +msgstr "Bağlantı verilen:" #: db_datadict.php:172 db_printview.php:110 #: libraries/config/messages.inc.php:94 libraries/config/messages.inc.php:109 @@ -970,6 +970,8 @@ msgstr "" msgid "" "Cannot convert file's character set without character set conversion library" msgstr "" +"Karakter grubu dönüştürme kütüphanesi olmadan dosyanın karakter grubu " +"dönüştürülemez" #: import.php:376 libraries/display_import.lib.php:23 msgid "Could not load import plugins, please check your installation!" @@ -5266,16 +5268,16 @@ msgstr "Açık Belge Metni" #: libraries/config/validate.lib.php:198 msgid "Could not initialize Drizzle connection library" -msgstr "" +msgstr "Drizzle bağlantı kütüphanesi başlatılamadı" #: libraries/config/validate.lib.php:205 libraries/config/validate.lib.php:212 #| msgid "Could not connect to MySQL server" msgid "Could not connect to Drizzle server" -msgstr "Drizzle sunucusuna bağlanamadı" +msgstr "Drizzle sunucusuna bağlanılamadı" #: libraries/config/validate.lib.php:223 libraries/config/validate.lib.php:230 msgid "Could not connect to MySQL server" -msgstr "MySQL sunucusuna bağlanamadı" +msgstr "MySQL sunucusuna bağlanılamadı" #: libraries/config/validate.lib.php:254 msgid "Empty username while using config authentication method" @@ -5378,7 +5380,7 @@ msgstr "Sunucu yanıt vermiyor" #: libraries/dbi/drizzle.dbi.lib.php:344 #| msgid "(or the local MySQL server's socket is not correctly configured)" msgid "(or the local Drizzle server's socket is not correctly configured)" -msgstr "(ya da yerel Drizeel sunucusunun soketi doğru olarak yapılandırılmadı)" +msgstr "(ya da yerel Drizzle sunucusunun soketi doğru olarak yapılandırılmadı)" #: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysqli.dbi.lib.php:384 msgid "(or the local MySQL server's socket is not correctly configured)" @@ -7796,7 +7798,7 @@ msgstr "Karakter Grupları" #: libraries/server_links.inc.php:104 server_plugins.php:47 #: server_plugins.php:80 msgid "Plugins" -msgstr "" +msgstr "Eklentiler" #: libraries/server_links.inc.php:108 msgid "Engines" @@ -8121,7 +8123,7 @@ msgstr "" #: libraries/transformations/image_jpeg__link.inc.php:10 msgid "Displays a link to download this image." -msgstr "Bu resmi indirme için bağlantı görüntüler." +msgstr "Bu resmi indirmek için bağlantı görüntüler." #: libraries/transformations/text_plain__dateformat.inc.php:10 msgid "" @@ -8283,7 +8285,7 @@ msgstr "Veritabanı sunucusu" #: main.php:159 msgid "Software" -msgstr "" +msgstr "Yazılım" #: main.php:160 #| msgid "Show versions" @@ -8801,7 +8803,7 @@ msgstr "Veritabanlarının dökümünü (şemasını) göster" #: server_plugins.php:81 msgid "Modules" -msgstr "" +msgstr "Modüller" #: server_plugins.php:102 msgid "Begin" @@ -8809,15 +8811,15 @@ msgstr "Yukarı" #: server_plugins.php:111 msgid "Plugin" -msgstr "" +msgstr "Eklenti" #: server_plugins.php:112 server_plugins.php:146 msgid "Module" -msgstr "" +msgstr "Modül" #: server_plugins.php:113 server_plugins.php:148 msgid "Library" -msgstr "" +msgstr "Kütüphane" #: server_plugins.php:114 server_plugins.php:149 tbl_tracking.php:635 msgid "Version" @@ -8825,7 +8827,7 @@ msgstr "Sürüm" #: server_plugins.php:115 server_plugins.php:150 msgid "Author" -msgstr "" +msgstr "Hazırlayan" #: server_plugins.php:116 server_plugins.php:151 msgid "License" @@ -11983,7 +11985,7 @@ msgstr "Drizzle belgesi http://docs.drizzle.org/ adresinde" #: po/advisory_rules.php:63 #, php-format msgid "Version string (%s) matches Drizzle versioning scheme" -msgstr "" +msgstr "Sürüm dizgisi (%s) Drizzle çeşitleme şemasıyla eşleşiyor" #: po/advisory_rules.php:65 msgid "MySQL Architecture" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_4-17266-g53f7ea5
by Piotr Przybylski 25 Aug '11

25 Aug '11

The branch, master has been updated via 53f7ea521e39637c263cda8ecaa44bd0fdeab76c (commit) via f45a79a6511edbf2e32124b7918b6f5a473bf0e2 (commit) via bd3b7d28d45d432a1262e66392364ec22703368d (commit) from 2dd51d579be885992a35c12c74e187287c373342 (commit) - Log ----------------------------------------------------------------- commit 53f7ea521e39637c263cda8ecaa44bd0fdeab76c Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Thu Aug 25 13:20:50 2011 +0200 PHPDoc commit f45a79a6511edbf2e32124b7918b6f5a473bf0e2 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Thu Aug 25 13:16:28 2011 +0200 Whitespace cleanup, code formatting commit bd3b7d28d45d432a1262e66392364ec22703368d Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Thu Aug 25 13:16:06 2011 +0200 Whitespace cleanup ----------------------------------------------------------------------- Summary of changes: libraries/config.default.php | 2 +- libraries/export/xml.php | 8 ++-- libraries/svg_plot/pma_scatter_plot.php | 70 +++++++++++++---------------- libraries/svg_plot/pma_svg_data_point.php | 7 +-- tbl_select.php | 13 +++--- tbl_structure.php | 4 +- 6 files changed, 47 insertions(+), 57 deletions(-) diff --git a/libraries/config.default.php b/libraries/config.default.php index 0ee64f6..57ed7a7 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -2807,7 +2807,7 @@ if ($cfg['ShowFunctionFields']) { 'FUNC_CHAR' => '', 'FUNC_DATE' => '', 'FUNC_NUMBER' => '', - 'FUNC_SPATIAL' => 'GeomFromText', + 'FUNC_SPATIAL' => 'GeomFromText', 'FUNC_UUID' => 'UUID', 'first_timestamp' => 'NOW', ); diff --git a/libraries/export/xml.php b/libraries/export/xml.php index 694f04b..a6b4940 100644 --- a/libraries/export/xml.php +++ b/libraries/export/xml.php @@ -32,7 +32,7 @@ if (isset($plugin_list)) { 'type' => 'begin_group', 'name' => 'structure', 'text' => __('Object creation options (all are recommended)') - ); + ); if (!PMA_DRIZZLE) { $plugin_list['xml']['options'][] = array( 'type' => 'bool', @@ -43,7 +43,7 @@ if (isset($plugin_list)) { 'type' => 'bool', 'name' => 'export_procedures', 'text' => __('Procedures') - ); + ); } $plugin_list['xml']['options'][] = array( 'type' => 'bool', @@ -60,8 +60,8 @@ if (isset($plugin_list)) { 'type' => 'bool', 'name' => 'export_views', 'text' => __('Views') - ); - } + ); + } $plugin_list['xml']['options'][] = array( 'type' => 'end_group' ); diff --git a/libraries/svg_plot/pma_scatter_plot.php b/libraries/svg_plot/pma_scatter_plot.php index 10c0aea..c0be405 100644 --- a/libraries/svg_plot/pma_scatter_plot.php +++ b/libraries/svg_plot/pma_scatter_plot.php @@ -119,12 +119,12 @@ class PMA_Scatter_Plot $this->_dataPoints = array(); if (! is_null($this->_userSpecifiedSettings)) { foreach (array_keys($this->_userSpecifiedSettings) as $key){ - $this->_settings[$key] = $this->_userSpecifiedSettings[$key]; - } + $this->_settings[$key] = $this->_userSpecifiedSettings[$key]; + } } if ($this->_settings['dataLabel'] == '') { - $labels = array_keys($this->_data[0]); - $this->_settings['dataLabel'] = $labels[0]; + $labels = array_keys($this->_data[0]); + $this->_settings['dataLabel'] = $labels[0]; } } @@ -143,7 +143,7 @@ class PMA_Scatter_Plot . ' height="' . $this->_settings['height'] . '">'; $output .= '<g id="groupPanel">'; $output .= '<defs> - <path id="myTextPath1" + <path id="myTextPath1" d="M10,190 L10,50"/> <path id="myTextPath2" d="M250,10 L370,10"/> @@ -194,41 +194,38 @@ class PMA_Scatter_Plot // Currently assuming only numeric fields are selected $coordinates = array(); foreach ($data as $row) { - $coordinates[0][] = $row[$xField]; - $coordinates[1][] = $row[$yField]; - } + $coordinates[0][] = $row[$xField]; + $coordinates[1][] = $row[$yField]; + } for ($i = 0 ; $i < 2 ; $i++) { - $maxC = ($i == 0) ? 500 : 320; - if( !is_numeric($coordinates[$i][0])) { + if ( !is_numeric($coordinates[$i][0])) { $uniqueC = array_unique($coordinates[$i]); $countC = count(array_unique($coordinates[$i])); - $map = $tmp = array(); + $map = $tmp = array(); foreach ($uniqueC as $uc) { - $tmp[] = $uc; - } + $tmp[] = $uc; + } for ($j = 0 ; $j < $countC ; $j++) { $map[$tmp[$j]] = 20 + $j * $maxC / $countC; - } - for($j = 0 ; $j < count($coordinates[$i]) ; $j++) { - $coordinates[$i][$j] = $map[$coordinates[$i][$j]]; - } - - } - elseif (is_numeric($coordinates[$i][0])) { - - $maxC = max($coordinates[$i]); - for($j = 0 ; $j < count($coordinates[$i]) ; $j++) { - - if ($i == 0) - $coordinates[$i][$j] = 20 + 500 * $coordinates[$i][$j] / $maxC; - else - $coordinates[$i][$j] = 20 + 320 * (1 - $coordinates[$i][$j] / $maxC); - } - } - } - return $coordinates; + } + for ($j = 0 ; $j < count($coordinates[$i]) ; $j++) { + $coordinates[$i][$j] = $map[$coordinates[$i][$j]]; + } + } + else if (is_numeric($coordinates[$i][0])) { + $maxC = max($coordinates[$i]); + for ($j = 0 ; $j < count($coordinates[$i]) ; $j++) { + if ($i == 0) { + $coordinates[$i][$j] = 20 + 500 * $coordinates[$i][$j] / $maxC; + } else { + $coordinates[$i][$j] = 20 + 320 * (1 - $coordinates[$i][$j] / $maxC); + } + } + } + } + return $coordinates; } /** @@ -238,15 +235,13 @@ class PMA_Scatter_Plot * @param int $color_number Start index to the color array * @param array $scale_data Data related to scaling * @param string $label Label for the data points - * @param image $results Image object in the case of png - * - * @return the formatted array of data. + * @return string the formatted array of data. */ private function _prepareDataSet($data, $color_number, $scale_data, $label) { $result = ''; // loop through the rows - for($i = 0 ; $i < count($data) ; $i++) { + for ($i = 0 ; $i < count($data) ; $i++) { $index = $color_number % sizeof($this->_settings['colors']); @@ -255,11 +250,10 @@ class PMA_Scatter_Plot $options = array('color' => $this->_settings['colors'][$index], 'id' => $i); $this->_dataPoints[] = $data_element; - $result .= $data_element->prepareRowAsSVG($options); + $result .= $data_element->prepareRowAsSVG($options); $color_number++; } - return $result; } } diff --git a/libraries/svg_plot/pma_svg_data_point.php b/libraries/svg_plot/pma_svg_data_point.php index 7d01b2b..ceaa8bc 100644 --- a/libraries/svg_plot/pma_svg_data_point.php +++ b/libraries/svg_plot/pma_svg_data_point.php @@ -25,9 +25,8 @@ class PMA_SVG_Data_Point extends PMA_SVG_Data_Element public function __construct($cx, $cy, $label, $dataRow) { parent::__construct($label,$dataRow); - $this->cx = $cx; - $this->cy = $cy; - + $this->cx = $cx; + $this->cy = $cy; } public function prepareRowAsSVG($options) @@ -39,10 +38,8 @@ class PMA_SVG_Data_Point extends PMA_SVG_Data_Element * Prepares and returns the code related to a row in the query result as SVG. * * @param array $options Array containing options related to properties of the point - * * @return the code related to a row in the query result. */ - protected function prepareSvg($options) { $point_options = array( diff --git a/tbl_select.php b/tbl_select.php index ee5da27..abda399 100644 --- a/tbl_select.php +++ b/tbl_select.php @@ -162,9 +162,9 @@ echo PMA_generate_html_tabs(PMA_tbl_getSubTabs(), $url_params); $foreignData = PMA_getForeignData($foreigners, $field, false, '', ''); - echo PMA_getForeignFields_Values($foreigners, $foreignData, $field, $fields_type, $i, $db, $table, $titles,$GLOBALS['cfg']['ForeignKeyMaxLimit'], '', true); + echo PMA_getForeignFields_Values($foreigners, $foreignData, $field, $fields_type, $i, $db, $table, $titles,$GLOBALS['cfg']['ForeignKeyMaxLimit'], '', true); - ?> + ?> <input type="hidden" name="names[<?php echo $i; ?>]" value="<?php echo htmlspecialchars($fields_list[$i]); ?>" /> <input type="hidden" name="types[<?php echo $i; ?>]" @@ -290,16 +290,15 @@ else { reset($func); while (list($i, $func_type) = each($func)) { - list($charsets[$i]) = explode('_', $collations[$i]); + list($charsets[$i]) = explode('_', $collations[$i]); $unaryFlag = (isset($GLOBALS['cfg']['UnaryOperators'][$func_type]) && $GLOBALS['cfg']['UnaryOperators'][$func_type] == 1) ? true : false; $tmp_geom_func = isset($geom_func[$i]) ? $geom_func[$i] : null; - $whereClause = PMA_tbl_search_getWhereClause($fields[$i],$names[$i], $types[$i], $collations[$i], $func_type, $unaryFlag, $tmp_geom_func); + $whereClause = PMA_tbl_search_getWhereClause($fields[$i],$names[$i], $types[$i], $collations[$i], $func_type, $unaryFlag, $tmp_geom_func); - if($whereClause) - $w[] = $whereClause; + if($whereClause) + $w[] = $whereClause; } // end for - //print_r($w); if ($w) { $sql_query .= ' WHERE ' . implode(' AND ', $w); } diff --git a/tbl_structure.php b/tbl_structure.php index 6604ea2..4c3842c 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -507,8 +507,8 @@ foreach ($fields as $row) { } } ?> </div> - <?php if (!PMA_DRIZZLE) { ?> - <div class="action_spatial"> + <?php if (!PMA_DRIZZLE) { ?> + <div class="action_spatial"> <?php if (isset($spatial_enabled)) { if ($spatial_enabled) { ?> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin scripts branch, master, updated. 33c24a3a2a4bf67844e2e1da81236f745f0b265c
by Michal Čihař 25 Aug '11

25 Aug '11

The branch, master has been updated via 33c24a3a2a4bf67844e2e1da81236f745f0b265c (commit) from 9e67c1ede429420e101b5271adb55bf5dc1735ea (commit) - Log ----------------------------------------------------------------- commit 33c24a3a2a4bf67844e2e1da81236f745f0b265c Author: Michal Čihař <michal(a)cihar.com> Date: Thu Aug 25 12:48:29 2011 +0200 Fix path ----------------------------------------------------------------------- Summary of changes: website/pma-copy-docs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/website/pma-copy-docs b/website/pma-copy-docs index a45c0f5..2dd16bd 100755 --- a/website/pma-copy-docs +++ b/website/pma-copy-docs @@ -8,7 +8,7 @@ git pull -q rsync -az favicon.ico CREDITS ChangeLog Documentation.html INSTALL LICENSE README docs.css web.sourceforge.net:htdocs/documentation/ cd themes/original/img/ rsync -az docs_menu_bg.png logo_right.png web.sourceforge.net:htdocs/documentation/themes/original/img/ -cd /home/pmaweb/pma/phpMyAdmin/libraries/ +cd /home/pmaweb/pma/phpmyadmin/libraries/ rsync -az vendor_config.php web.sourceforge.net:htdocs/documentation/libraries/ # Localised documentation hooks/post-receive -- phpMyAdmin scripts

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_4-17263-g2dd51d5
by Michal Čihař 25 Aug '11

25 Aug '11

The branch, master has been updated via 2dd51d579be885992a35c12c74e187287c373342 (commit) via e2948b1a50ef3eb6c68fec74c45ba0f9d3a07330 (commit) via 07462d1238534921e40ea6a0e417cd45e12b8d1f (commit) via 3cabd054ad2416f9525da84ea6e1ab109e298b54 (commit) via cbe041c7c120e4ba318d11305d006f967b03da96 (commit) via 76ff1ff981f253e0baeffe6869c18e1485a1fd80 (commit) via 9a89c9b385fcaa40b0ab1e0895290edbe8a30b95 (commit) via 31cb8b0f6cf9367da276bc7f6b241fadd652ed46 (commit) via 19b5851470497630aac64ab7986cafe8d6b31c68 (commit) via 85d61b1f142af8e86f83eec1e1d0f2a479766261 (commit) via c7bcda0299af982fcb4d0dd04537cbfc18ca65bc (commit) via 066ca0df368067461db2ee69780926e04d779449 (commit) via d6c62420ebc541087fccafce4a0e1051e628cb06 (commit) via bcfbcab3a052b9a1cece2626be23ce578505208d (commit) via 5012b3d88085602ae8155cd79076b0ffd8cdb0f0 (commit) via e1fd004bb2118e725a3239ad61fd2014dd62d829 (commit) via 5e6e2e3e5d0fe9a1fc8b40dae1e674330cfcbb08 (commit) via 409b1dc125eb923a184fb7996c2fd280db4f0411 (commit) via e473a5f3351901c47894473da110e1a7ebd17603 (commit) via 8745cb4c475ca4bbe216cedb5b61def9ba37650b (commit) via 81124927a8dedec4faaa957869a1d4f58a7dd273 (commit) via a3afc2d56f28af8df3c666c5c93859502146bdb9 (commit) via 96e070d84aa68bdb366ad70dc41be0330f61b5cc (commit) via b4ec82881f1d7735fe6f35b50f28f9216dc6b288 (commit) from 0e3bdcdb4ccb17705122b8dd72a71886ec6543dc (commit) - Log ----------------------------------------------------------------- commit 2dd51d579be885992a35c12c74e187287c373342 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Aug 25 12:06:47 2011 +0200 Translation update done using Pootle. commit e2948b1a50ef3eb6c68fec74c45ba0f9d3a07330 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Aug 25 12:06:32 2011 +0200 Translation update done using Pootle. commit 07462d1238534921e40ea6a0e417cd45e12b8d1f Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Aug 25 12:05:50 2011 +0200 Translation update done using Pootle. commit 3cabd054ad2416f9525da84ea6e1ab109e298b54 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Aug 25 12:05:33 2011 +0200 Translation update done using Pootle. commit cbe041c7c120e4ba318d11305d006f967b03da96 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Aug 25 12:05:09 2011 +0200 Translation update done using Pootle. commit 76ff1ff981f253e0baeffe6869c18e1485a1fd80 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Aug 25 12:04:58 2011 +0200 Translation update done using Pootle. commit 9a89c9b385fcaa40b0ab1e0895290edbe8a30b95 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Aug 25 12:04:42 2011 +0200 Translation update done using Pootle. commit 31cb8b0f6cf9367da276bc7f6b241fadd652ed46 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Aug 25 12:04:29 2011 +0200 Translation update done using Pootle. commit 19b5851470497630aac64ab7986cafe8d6b31c68 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Aug 25 12:04:05 2011 +0200 Translation update done using Pootle. commit 85d61b1f142af8e86f83eec1e1d0f2a479766261 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Aug 25 12:03:43 2011 +0200 Translation update done using Pootle. commit c7bcda0299af982fcb4d0dd04537cbfc18ca65bc Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Aug 25 11:59:34 2011 +0200 Translation update done using Pootle. commit 066ca0df368067461db2ee69780926e04d779449 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Thu Aug 25 11:36:31 2011 +0200 Translation update done using Pootle. commit d6c62420ebc541087fccafce4a0e1051e628cb06 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Thu Aug 25 11:35:35 2011 +0200 Translation update done using Pootle. commit bcfbcab3a052b9a1cece2626be23ce578505208d Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Thu Aug 25 11:35:25 2011 +0200 Translation update done using Pootle. commit 5012b3d88085602ae8155cd79076b0ffd8cdb0f0 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Thu Aug 25 11:34:53 2011 +0200 Translation update done using Pootle. commit e1fd004bb2118e725a3239ad61fd2014dd62d829 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Thu Aug 25 11:27:00 2011 +0200 Translation update done using Pootle. commit 5e6e2e3e5d0fe9a1fc8b40dae1e674330cfcbb08 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Thu Aug 25 11:26:34 2011 +0200 Translation update done using Pootle. commit 409b1dc125eb923a184fb7996c2fd280db4f0411 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Thu Aug 25 11:26:13 2011 +0200 Translation update done using Pootle. commit e473a5f3351901c47894473da110e1a7ebd17603 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Thu Aug 25 11:25:52 2011 +0200 Translation update done using Pootle. commit 8745cb4c475ca4bbe216cedb5b61def9ba37650b Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Thu Aug 25 11:25:13 2011 +0200 Translation update done using Pootle. commit 81124927a8dedec4faaa957869a1d4f58a7dd273 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Thu Aug 25 11:23:20 2011 +0200 Translation update done using Pootle. commit a3afc2d56f28af8df3c666c5c93859502146bdb9 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Thu Aug 25 11:22:13 2011 +0200 Translation update done using Pootle. commit 96e070d84aa68bdb366ad70dc41be0330f61b5cc Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Thu Aug 25 11:21:33 2011 +0200 Translation update done using Pootle. commit b4ec82881f1d7735fe6f35b50f28f9216dc6b288 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Thu Aug 25 11:20:00 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/ja.po | 38 +++++++++++++------------------------- po/tr.po | 35 +++++++++++++---------------------- 2 files changed, 26 insertions(+), 47 deletions(-) diff --git a/po/ja.po b/po/ja.po index eebf172..5973a1c 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-25 08:38+0200\n" -"PO-Revision-Date: 2011-08-23 12:27+0200\n" +"PO-Revision-Date: 2011-08-25 11:36+0200\n" "Last-Translator: Yuichiro <yuichiro(a)pop07.odn.ne.jp>\n" "Language-Team: japanese <jp(a)li.org>\n" "Language: ja\n" @@ -2314,10 +2314,9 @@ msgid_plural "%1$d rows inserted." msgstr[0] "%1$d 行挿入しました。" #: libraries/PDF.class.php:81 -#, fuzzy #| msgid "Allows reading data." msgid "Error while creating PDF:" -msgstr "データの読み込みを許可する" +msgstr "PDF を作成中にエラーが発生しました：" #: libraries/RecentTable.class.php:107 msgid "Could not save recent table" @@ -2352,10 +2351,9 @@ msgid "This MySQL server does not support the %s storage engine." msgstr "この MySQL サーバは %s ストレージエンジンをサポートしていません" #: libraries/Table.class.php:329 -#, fuzzy #| msgid "Show slave status" msgid "unknown table status: " -msgstr "スレーブの状態を表示する" +msgstr "不明なテーブルステータス：" #: libraries/Table.class.php:1115 msgid "Invalid database" @@ -5337,10 +5335,9 @@ msgid "The server is not responding" msgstr "サーバが応答しません" #: libraries/dbi/drizzle.dbi.lib.php:344 -#, fuzzy #| msgid "(or the local MySQL server's socket is not correctly configured)" msgid "(or the local Drizzle server's socket is not correctly configured)" -msgstr "(あるいはローカルの MySQL サーバのソケットが正しく設定されていません)" +msgstr "(あるいはローカルの Drizzle サーバのソケットが正しく設定されていません)" #: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysqli.dbi.lib.php:384 msgid "(or the local MySQL server's socket is not correctly configured)" @@ -8212,10 +8209,9 @@ msgid "General Settings" msgstr "一般設定" #: main.php:101 -#, fuzzy #| msgid "MySQL connection collation" msgid "Server connection collation" -msgstr "MySQL 接続の照合順序" +msgstr "サーバ接続の照合順序" #: main.php:116 msgid "Appearance Settings" @@ -8226,20 +8222,18 @@ msgid "More settings" msgstr "詳細設定" #: main.php:156 -#, fuzzy #| msgid "Database for user" msgid "Database server" -msgstr "ユーザ専用データベース" +msgstr "データベースサーバ" #: main.php:159 msgid "Software" -msgstr "" +msgstr "ソフトウェア" #: main.php:160 -#, fuzzy #| msgid "Show versions" msgid "Software version" -msgstr "バージョンを表示する" +msgstr "ソフトウェアバージョン" #: main.php:161 msgid "Protocol version" @@ -8252,20 +8246,18 @@ msgid "User" msgstr "ユーザ" #: main.php:167 -#, fuzzy #| msgid "Server socket" msgid "Server charset" -msgstr "サーバのソケット" +msgstr "サーバの文字セット" #: main.php:179 msgid "Web server" msgstr "ウェブサーバ" #: main.php:190 -#, fuzzy #| msgid "Use light version" msgid "Database client version" -msgstr "軽快モードを使用する" +msgstr "データベースクライアントのバージョン" #: main.php:192 msgid "PHP extension" @@ -8788,7 +8780,6 @@ msgid "License" msgstr "ライセンス" #: server_plugins.php:182 -#, fuzzy #| msgid "Disabled" msgid "disabled" msgstr "無効" @@ -9495,10 +9486,9 @@ msgid "Show unformatted values" msgstr "生の値（書式化なし）で表示する" #: server_status.php:859 -#, fuzzy #| msgid "Related Links" msgid "Related links:" -msgstr "関連リンク" +msgstr "関連リンク:" #: server_status.php:892 #, fuzzy @@ -11447,10 +11437,9 @@ msgid "Show more actions" msgstr "他の操作を表示する" #: tbl_structure.php:604 -#, fuzzy #| msgid "Print view" msgid "Edit view" -msgstr "印刷用画面" +msgstr "ビューを編集する" #: tbl_structure.php:621 msgid "Relation view" @@ -11911,10 +11900,9 @@ msgid "'percona' found in version_comment" msgstr "" #: po/advisory_rules.php:62 -#, fuzzy #| msgid "Percona documentation is at http://www.percona.com/docs/wiki/" msgid "Drizzle documentation is at http://docs.drizzle.org/" -msgstr "Percona ドキュメントは http://www.percona.com/docs/wiki/ にあります。" +msgstr "Drizzle ドキュメントは http://docs.drizzle.org/ にあります。" #: po/advisory_rules.php:63 #, php-format diff --git a/po/tr.po b/po/tr.po index b38800f..e33621b 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-25 08:38+0200\n" -"PO-Revision-Date: 2011-08-22 22:59+0200\n" +"PO-Revision-Date: 2011-08-25 12:06+0200\n" "Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n" "Language-Team: turkish <tr(a)li.org>\n" "Language: tr\n" @@ -881,10 +881,10 @@ msgstr "Y" #: gis_data_editor.php:195 gis_data_editor.php:243 gis_data_editor.php:295 #: js/messages.php:289 -#, fuzzy, php-format +#, php-format #| msgid "Point" msgid "Point %d" -msgstr "Nokta" +msgstr "Nokta %d" #: gis_data_editor.php:204 gis_data_editor.php:250 gis_data_editor.php:302 #: js/messages.php:295 @@ -5269,10 +5269,9 @@ msgid "Could not initialize Drizzle connection library" msgstr "" #: libraries/config/validate.lib.php:205 libraries/config/validate.lib.php:212 -#, fuzzy #| msgid "Could not connect to MySQL server" msgid "Could not connect to Drizzle server" -msgstr "MySQL sunucusuna bağlanamadı" +msgstr "Drizzle sunucusuna bağlanamadı" #: libraries/config/validate.lib.php:223 libraries/config/validate.lib.php:230 msgid "Could not connect to MySQL server" @@ -5377,10 +5376,9 @@ msgid "The server is not responding" msgstr "Sunucu yanıt vermiyor" #: libraries/dbi/drizzle.dbi.lib.php:344 -#, fuzzy #| msgid "(or the local MySQL server's socket is not correctly configured)" msgid "(or the local Drizzle server's socket is not correctly configured)" -msgstr "(ya da yerel MySQL sunucusunun soketi doğru olarak yapılandırılmadı)" +msgstr "(ya da yerel Drizeel sunucusunun soketi doğru olarak yapılandırılmadı)" #: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysqli.dbi.lib.php:384 msgid "(or the local MySQL server's socket is not correctly configured)" @@ -8266,10 +8264,9 @@ msgid "General Settings" msgstr "Genel Ayarlar" #: main.php:101 -#, fuzzy #| msgid "MySQL connection collation" msgid "Server connection collation" -msgstr "MySQL bağlantı karşılaştırması" +msgstr "Sunucu bağlantısı karşılaştırması" #: main.php:116 msgid "Appearance Settings" @@ -8280,20 +8277,18 @@ msgid "More settings" msgstr "Daha fazla ayarlar" #: main.php:156 -#, fuzzy #| msgid "Database for user" msgid "Database server" -msgstr "Kullanıcı için veritabanı" +msgstr "Veritabanı sunucusu" #: main.php:159 msgid "Software" msgstr "" #: main.php:160 -#, fuzzy #| msgid "Show versions" msgid "Software version" -msgstr "Sürümleri göster" +msgstr "Yazılım sürümü" #: main.php:161 msgid "Protocol version" @@ -8306,20 +8301,18 @@ msgid "User" msgstr "Kullanıcı" #: main.php:167 -#, fuzzy #| msgid "Server socket" msgid "Server charset" -msgstr "Sunucu soketi" +msgstr "Sunucu karakter grubu" #: main.php:179 msgid "Web server" msgstr "Web sunucusu" #: main.php:190 -#, fuzzy #| msgid "Use light version" msgid "Database client version" -msgstr "Sade sürümü kullan" +msgstr "Veritabanı istemcisi sürümü" #: main.php:192 msgid "PHP extension" @@ -8839,10 +8832,9 @@ msgid "License" msgstr "Lisans" #: server_plugins.php:182 -#, fuzzy #| msgid "Disabled" msgid "disabled" -msgstr "Etkisiz" +msgstr "etkisizleştirildi" #: server_privileges.php:32 server_privileges.php:364 msgid "Includes all privileges except GRANT." @@ -11977,17 +11969,16 @@ msgstr "MySQL kılavuzu sadece resmi MySQL binarileri için doğrudur." #: po/advisory_rules.php:57 msgid "Percona documentation is at http://www.percona.com/docs/wiki/" -msgstr "Percona belgeleri http://www.percona.com/docs/wiki/ adresinde" +msgstr "Percona belgesi http://www.percona.com/docs/wiki/ adresinde" #: po/advisory_rules.php:58 msgid "'percona' found in version_comment" msgstr "'percona', version_comment içinde bulundu" #: po/advisory_rules.php:62 -#, fuzzy #| msgid "Percona documentation is at http://www.percona.com/docs/wiki/" msgid "Drizzle documentation is at http://docs.drizzle.org/" -msgstr "Percona belgeleri http://www.percona.com/docs/wiki/ adresinde" +msgstr "Drizzle belgesi http://docs.drizzle.org/ adresinde" #: po/advisory_rules.php:63 #, php-format hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_4-17239-g0e3bdcd
by Michal Čihař 25 Aug '11

25 Aug '11

The branch, master has been updated via 0e3bdcdb4ccb17705122b8dd72a71886ec6543dc (commit) via f8a0c4cfdedacdf6073f81916c5cced89c2cb57d (commit) via 661505c46bf31bec024bbb65c2c1c40008c492e7 (commit) via 2a8846eec5d89fb4cd2dcc5d89d64302f155a774 (commit) via eb0b9c3d6ad3be784de2b7bf38423b359cc2c668 (commit) via 2b4083e6a8d2482a4a380bab6dd504b7583918e5 (commit) via f508378d94ccc25fd0ef2e0d219459f6dcf80c6d (commit) via 3b99fb92a60acae45a856d2f0fd849a71356f0e0 (commit) via 7025e2af34e58d55774a3ab981b3f9792e56fc5a (commit) via a6b2013def7c56a235b7527052925f9f6c737ec2 (commit) via 5ae4fc2d05e3c7982d3df3542e2fa912e955137c (commit) via 0f4392ecd6e03ddf2825227ac0983589d81b2f00 (commit) via afb9dcef9c199595a2b59138e5077e3cc2430512 (commit) via a1e69fa7997083b017727d951eb5aa5428e66423 (commit) via dca3e7d847c364cfdd96a53aa11a49a1b79ac2d2 (commit) via 723130274e8a1b467a1c78d44d4d8535d8004f96 (commit) via 1157169d3ff9ee120243229e29037ae5cfa06650 (commit) via 7d8edd61aab7b0189201af9c262526ec67b54845 (commit) via ba2f8123da1f5184a465b1eb2e82aae5ccba7d6b (commit) via f444d0f1273d3815959693789b1b9ac8d97bae25 (commit) via d7e11efb0f8aa9772768eae0d6d78ae9332fc3b4 (commit) via b9e94d15629f9781092d767fb286722699e2089c (commit) via 7aa62940baf6557c96b0df01047be76e695eff86 (commit) via b0aa4c03925ae097dd66d6d0ecad68476e3a14b8 (commit) from d3c7b0ea4dfa69b97a7c0cc8bd2c9f2adcf3a86a (commit) - Log ----------------------------------------------------------------- commit 0e3bdcdb4ccb17705122b8dd72a71886ec6543dc Merge: d3c7b0e f8a0c4c Author: Michal Čihař <michal(a)cihar.com> Date: Thu Aug 25 09:03:03 2011 +0200 Merge remote-tracking branch 'pootle/master' commit f8a0c4cfdedacdf6073f81916c5cced89c2cb57d Author: Michal Čihař <michal(a)cihar.com> Date: Thu Aug 25 09:02:41 2011 +0200 Translation update done using Pootle. commit 661505c46bf31bec024bbb65c2c1c40008c492e7 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Aug 25 09:02:37 2011 +0200 Translation update done using Pootle. commit 2a8846eec5d89fb4cd2dcc5d89d64302f155a774 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Aug 25 09:02:34 2011 +0200 Translation update done using Pootle. commit eb0b9c3d6ad3be784de2b7bf38423b359cc2c668 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Aug 25 09:02:29 2011 +0200 Translation update done using Pootle. commit 2b4083e6a8d2482a4a380bab6dd504b7583918e5 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Aug 25 09:02:25 2011 +0200 Translation update done using Pootle. commit f508378d94ccc25fd0ef2e0d219459f6dcf80c6d Author: Michal Čihař <michal(a)cihar.com> Date: Thu Aug 25 09:02:19 2011 +0200 Translation update done using Pootle. commit 3b99fb92a60acae45a856d2f0fd849a71356f0e0 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Aug 25 09:02:13 2011 +0200 Translation update done using Pootle. commit 7025e2af34e58d55774a3ab981b3f9792e56fc5a Author: Michal Čihař <michal(a)cihar.com> Date: Thu Aug 25 09:01:58 2011 +0200 Translation update done using Pootle. commit a6b2013def7c56a235b7527052925f9f6c737ec2 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Aug 25 09:01:49 2011 +0200 Translation update done using Pootle. commit 5ae4fc2d05e3c7982d3df3542e2fa912e955137c Author: Michal Čihař <michal(a)cihar.com> Date: Thu Aug 25 09:01:43 2011 +0200 Translation update done using Pootle. commit 0f4392ecd6e03ddf2825227ac0983589d81b2f00 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Aug 25 09:01:22 2011 +0200 Translation update done using Pootle. commit afb9dcef9c199595a2b59138e5077e3cc2430512 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Aug 25 09:01:13 2011 +0200 Translation update done using Pootle. commit a1e69fa7997083b017727d951eb5aa5428e66423 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Aug 25 09:01:04 2011 +0200 Translation update done using Pootle. commit dca3e7d847c364cfdd96a53aa11a49a1b79ac2d2 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Aug 25 09:00:48 2011 +0200 Translation update done using Pootle. commit 723130274e8a1b467a1c78d44d4d8535d8004f96 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Aug 25 09:00:38 2011 +0200 Translation update done using Pootle. commit 1157169d3ff9ee120243229e29037ae5cfa06650 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Aug 25 09:00:32 2011 +0200 Translation update done using Pootle. commit 7d8edd61aab7b0189201af9c262526ec67b54845 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Aug 25 08:59:38 2011 +0200 Translation update done using Pootle. commit ba2f8123da1f5184a465b1eb2e82aae5ccba7d6b Author: Michal Čihař <michal(a)cihar.com> Date: Thu Aug 25 08:44:39 2011 +0200 Translation update done using Pootle. commit f444d0f1273d3815959693789b1b9ac8d97bae25 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Aug 25 08:43:57 2011 +0200 Translation update done using Pootle. commit d7e11efb0f8aa9772768eae0d6d78ae9332fc3b4 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Aug 25 08:43:46 2011 +0200 Translation update done using Pootle. commit b9e94d15629f9781092d767fb286722699e2089c Author: Michal Čihař <michal(a)cihar.com> Date: Thu Aug 25 08:43:32 2011 +0200 Translation update done using Pootle. commit 7aa62940baf6557c96b0df01047be76e695eff86 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Aug 25 08:43:22 2011 +0200 Translation update done using Pootle. commit b0aa4c03925ae097dd66d6d0ecad68476e3a14b8 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Aug 25 08:41:09 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/cs.po | 62 +++++++++++++++++++++++++------------------------------------- 1 files changed, 25 insertions(+), 37 deletions(-) diff --git a/po/cs.po b/po/cs.po index 0f96dff..cf06775 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-25 08:38+0200\n" -"PO-Revision-Date: 2011-08-23 11:01+0200\n" +"PO-Revision-Date: 2011-08-25 09:02+0200\n" "Last-Translator: Michal Čihař <michal(a)cihar.com>\n" "Language-Team: czech <cs(a)li.org>\n" "Language: cs\n" @@ -888,10 +888,10 @@ msgstr "Y" #: gis_data_editor.php:195 gis_data_editor.php:243 gis_data_editor.php:295 #: js/messages.php:289 -#, fuzzy, php-format +#, php-format #| msgid "Point" msgid "Point %d" -msgstr "Bod" +msgstr "Bod %d" #: gis_data_editor.php:204 gis_data_editor.php:250 gis_data_editor.php:302 #: js/messages.php:295 @@ -899,10 +899,9 @@ msgid "Add a point" msgstr "Přidat bod" #: gis_data_editor.php:220 js/messages.php:290 -#, fuzzy #| msgid "Lines terminated by" msgid "Linestring" -msgstr "Řádky ukončené" +msgstr "Linka" #: gis_data_editor.php:223 gis_data_editor.php:279 js/messages.php:294 msgid "Outer Ring" @@ -910,19 +909,17 @@ msgstr "Vnější obrys" #: gis_data_editor.php:225 gis_data_editor.php:281 js/messages.php:293 msgid "Inner Ring" -msgstr "Vnitřní obrys:" +msgstr "Vnitřní obrys" #: gis_data_editor.php:252 -#, fuzzy #| msgid "Add a new User" msgid "Add a linestring" -msgstr "Přidat nového uživatele" +msgstr "Přidat linku" #: gis_data_editor.php:252 gis_data_editor.php:304 js/messages.php:296 -#, fuzzy #| msgid "Add a new User" msgid "Add an inner ring" -msgstr "Přidat nového uživatele" +msgstr "Přidat vnitřní obrys" #: gis_data_editor.php:266 js/messages.php:291 msgid "Polygon" @@ -980,7 +977,7 @@ msgstr "" #: import.php:352 msgid "" "Cannot convert file's character set without character set conversion library" -msgstr "" +msgstr "Bez potřebné knihovny nelze převést znakovou sadu" #: import.php:376 libraries/display_import.lib.php:23 msgid "Could not load import plugins, please check your installation!" @@ -1747,10 +1744,9 @@ msgid "Show search criteria" msgstr "Zobrazit parametry vyhledávání" #: js/messages.php:262 libraries/tbl_select.lib.php:138 -#, fuzzy #| msgid "Search" msgid "Zoom Search" -msgstr "Vyhledávání" +msgstr "Zoomovací vyhledávání" #: js/messages.php:264 msgid "Each point represents a data row." @@ -5221,13 +5217,12 @@ msgstr "Text OpenDocument" #: libraries/config/validate.lib.php:198 msgid "Could not initialize Drizzle connection library" -msgstr "" +msgstr "Nepodařilo se inicializovat knihovnu Drizzle" #: libraries/config/validate.lib.php:205 libraries/config/validate.lib.php:212 -#, fuzzy #| msgid "Could not connect to MySQL server" msgid "Could not connect to Drizzle server" -msgstr "Nepodařilo se připojit k MySQL serveru" +msgstr "Nepodařilo se připojit k Drizzle serveru" #: libraries/config/validate.lib.php:223 libraries/config/validate.lib.php:230 msgid "Could not connect to MySQL server" @@ -5329,10 +5324,9 @@ msgid "The server is not responding" msgstr "Server neodpovídá" #: libraries/dbi/drizzle.dbi.lib.php:344 -#, fuzzy #| msgid "(or the local MySQL server's socket is not correctly configured)" msgid "(or the local Drizzle server's socket is not correctly configured)" -msgstr "(nebo není správně nastaven lokální socket MySQL serveru)" +msgstr "(nebo není správně nastaven lokální socket Drizzle serveru)" #: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysqli.dbi.lib.php:384 msgid "(or the local MySQL server's socket is not correctly configured)" @@ -7736,7 +7730,7 @@ msgstr "Znakové sady" #: libraries/server_links.inc.php:104 server_plugins.php:47 #: server_plugins.php:80 msgid "Plugins" -msgstr "" +msgstr "Rozšíření" #: libraries/server_links.inc.php:108 msgid "Engines" @@ -8198,10 +8192,9 @@ msgid "General Settings" msgstr "Obecná nastavení" #: main.php:101 -#, fuzzy #| msgid "MySQL connection collation" msgid "Server connection collation" -msgstr "Porovnávání pro toto připojení k MySQL" +msgstr "Porovnávání pro toto připojení k serveru" #: main.php:116 msgid "Appearance Settings" @@ -8212,20 +8205,18 @@ msgid "More settings" msgstr "Více nastavení" #: main.php:156 -#, fuzzy #| msgid "Database for user" msgid "Database server" -msgstr "Databáze pro uživatele" +msgstr "Databázový server" #: main.php:159 msgid "Software" -msgstr "" +msgstr "Software" #: main.php:160 -#, fuzzy #| msgid "Show versions" msgid "Software version" -msgstr "Zobrazit verze" +msgstr "Verze software" #: main.php:161 msgid "Protocol version" @@ -8238,20 +8229,18 @@ msgid "User" msgstr "Uživatel" #: main.php:167 -#, fuzzy #| msgid "Server socket" msgid "Server charset" -msgstr "Socket serveru" +msgstr "Znaková sada" #: main.php:179 msgid "Web server" msgstr "Webserver" #: main.php:190 -#, fuzzy #| msgid "Use light version" msgid "Database client version" -msgstr "Použít odlehčenou verzi" +msgstr "Verze databázového klienta" #: main.php:192 msgid "PHP extension" @@ -8736,7 +8725,7 @@ msgstr "Export databází" #: server_plugins.php:81 msgid "Modules" -msgstr "" +msgstr "Moduly" #: server_plugins.php:102 msgid "Begin" @@ -8744,15 +8733,15 @@ msgstr "Začátek" #: server_plugins.php:111 msgid "Plugin" -msgstr "" +msgstr "Rozšíření" #: server_plugins.php:112 server_plugins.php:146 msgid "Module" -msgstr "" +msgstr "Modul" #: server_plugins.php:113 server_plugins.php:148 msgid "Library" -msgstr "" +msgstr "Knihovna" #: server_plugins.php:114 server_plugins.php:149 tbl_tracking.php:635 msgid "Version" @@ -8760,17 +8749,16 @@ msgstr "Verze" #: server_plugins.php:115 server_plugins.php:150 msgid "Author" -msgstr "" +msgstr "Autor" #: server_plugins.php:116 server_plugins.php:151 msgid "License" msgstr "Licence" #: server_plugins.php:182 -#, fuzzy #| msgid "Disabled" msgid "disabled" -msgstr "Vypnuto" +msgstr "vypnuto" #: server_privileges.php:32 server_privileges.php:364 msgid "Includes all privileges except GRANT." hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_4-17215-gd3c7b0e
by Michal Čihař 25 Aug '11

25 Aug '11

The branch, master has been updated via d3c7b0ea4dfa69b97a7c0cc8bd2c9f2adcf3a86a (commit) from 6e05e71d1f2585c0cae63b245e189346908c3a10 (commit) - Log ----------------------------------------------------------------- commit d3c7b0ea4dfa69b97a7c0cc8bd2c9f2adcf3a86a Author: Michal Čihař <michal(a)cihar.com> Date: Thu Aug 25 08:56:59 2011 +0200 Adjust to new calling conventions ----------------------------------------------------------------------- Summary of changes: libraries/pmd_common.php | 4 ++-- libraries/sql_query_form.lib.php | 2 +- libraries/tbl_select.lib.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/pmd_common.php b/libraries/pmd_common.php index e671690..7d14191 100644 --- a/libraries/pmd_common.php +++ b/libraries/pmd_common.php @@ -75,7 +75,7 @@ function get_tab_info() PMA_DBI_select_db($GLOBALS['db']); $tab_column = array(); for ($i = 0, $cnt = count($GLOBALS['PMD']["TABLE_NAME"]); $i < $cnt; $i++) { - $fields_rs = PMA_DBI_query(PMA_DBI_get_columns_sql($GLOBALS['db'], $GLOBALS['PMD']["TABLE_NAME_SMALL"][$i], true), NULL, PMA_DBI_QUERY_STORE); + $fields_rs = PMA_DBI_query(PMA_DBI_get_columns_sql($GLOBALS['db'], $GLOBALS['PMD']["TABLE_NAME_SMALL"][$i], null, true), NULL, PMA_DBI_QUERY_STORE); $j = 0; while ($row = PMA_DBI_fetch_assoc($fields_rs)) { $tab_column[$GLOBALS['PMD']['TABLE_NAME'][$i]]['COLUMN_ID'][$j] = $j; @@ -175,7 +175,7 @@ function get_all_keys($unique_only = false) require_once './libraries/Index.class.php'; $keys = array(); - + foreach ($GLOBALS['PMD']['TABLE_NAME_SMALL'] as $I => $table) { $schema = $GLOBALS['PMD']['OWNER'][$I]; // for now, take into account only the first index segment diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php index beab95d..78502c1 100644 --- a/libraries/sql_query_form.lib.php +++ b/libraries/sql_query_form.lib.php @@ -213,7 +213,7 @@ function PMA_sqlQueryFormInsert($query = '', $is_querywindow = false, $delimiter // Get the list and number of fields // we do a try_query here, because we could be in the query window, // trying to synchonize and the table has not yet been created - $fields_list = PMA_DBI_get_columns($db, $GLOBALS['table'], true); + $fields_list = PMA_DBI_get_columns($db, $GLOBALS['table'], null, true); $tmp_db_link = '<a href="' . $GLOBALS['cfg']['DefaultTabDatabase'] . '?' . PMA_generate_common_url($db) . '"'; diff --git a/libraries/tbl_select.lib.php b/libraries/tbl_select.lib.php index 446a26e..b200e45 100644 --- a/libraries/tbl_select.lib.php +++ b/libraries/tbl_select.lib.php @@ -46,7 +46,7 @@ function PMA_tbl_setTitle($propertiesIconic, $pmaThemeImage) function PMA_tbl_getFields($db, $table) { // Gets the list and number of fields - $fields = PMA_DBI_get_columns($db, $table, true); + $fields = PMA_DBI_get_columns($db, $table, null, true); $fields_list = $fields_null = $fields_type = $fields_collation = array(); $geom_column_present = false; $geom_types = PMA_getGISDatatypes(); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_4-17214-g6e05e71
by Michal Čihař 25 Aug '11

25 Aug '11

The branch, master has been updated via 6e05e71d1f2585c0cae63b245e189346908c3a10 (commit) via 7fdc4aa2ce4df220f7f6aa9c17f7aa88a6aa5bab (commit) via 016a210d6c146ee1822c396973dae7afacad25f2 (commit) via ddfa57e1dba67a260ce09b8b0532b63d2d2f6f78 (commit) via 347fca5b8683e9eee3c2b157370acdd7706a2824 (commit) from 5b54551280eebb60264cdb8dbe0e56c1f777e37c (commit) - Log ----------------------------------------------------------------- commit 6e05e71d1f2585c0cae63b245e189346908c3a10 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Aug 25 08:50:45 2011 +0200 Whitespace cleanup commit 7fdc4aa2ce4df220f7f6aa9c17f7aa88a6aa5bab Author: Michal Čihař <michal(a)cihar.com> Date: Thu Aug 25 08:50:36 2011 +0200 Fix syntax commit 016a210d6c146ee1822c396973dae7afacad25f2 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Aug 25 08:50:22 2011 +0200 Remove useless comment commit ddfa57e1dba67a260ce09b8b0532b63d2d2f6f78 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Aug 25 08:49:57 2011 +0200 Fix typo commit 347fca5b8683e9eee3c2b157370acdd7706a2824 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Aug 25 08:49:31 2011 +0200 Use same order of database and table params as elsewhere ----------------------------------------------------------------------- Summary of changes: libraries/tbl_select.lib.php | 9 +++------ tbl_select.php | 2 +- tbl_zoom_select.php | 20 ++++++++++---------- 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/libraries/tbl_select.lib.php b/libraries/tbl_select.lib.php index 07c5883..446a26e 100644 --- a/libraries/tbl_select.lib.php +++ b/libraries/tbl_select.lib.php @@ -3,9 +3,6 @@ /** * Functions for the table-search page and zoom-search page * - * Funtion PMA_tbl_getFields : Returns the fields of a table - * Funtion PMA_tbl_search_getWhereClause : Returns the where clause for query generation - * * @package phpMyAdmin */ @@ -40,13 +37,13 @@ function PMA_tbl_setTitle($propertiesIconic, $pmaThemeImage) * Gets all the fields of a table along with their types, collations * and whether null or not. * - * @param string $table Selected table * @param string $db Selected database + * @param string $table Selected table * * @return array Array containing the field list, field types, collations * and null constraint */ -function PMA_tbl_getFields($table,$db) +function PMA_tbl_getFields($db, $table) { // Gets the list and number of fields $fields = PMA_DBI_get_columns($db, $table, true); @@ -54,7 +51,7 @@ function PMA_tbl_getFields($table,$db) $geom_column_present = false; $geom_types = PMA_getGISDatatypes(); - foreach ($fields as $row) { + foreach ($fields as $key => $row) { $fields_list[] = $row['Field']; $type = $row['Type']; diff --git a/tbl_select.php b/tbl_select.php index b9c23d5..ee5da27 100644 --- a/tbl_select.php +++ b/tbl_select.php @@ -63,7 +63,7 @@ if (! isset($param) || $param[0] == '') { $err_url = $goto . '?' . PMA_generate_common_url($db, $table); // Gets the list and number of fields - list($fields_list, $fields_type, $fields_collation, $fields_null, $geom_column_present) = PMA_tbl_getFields($table,$db); + list($fields_list, $fields_type, $fields_collation, $fields_null, $geom_column_present) = PMA_tbl_getFields($db, $table); $fields_cnt = count($fields_list); // retrieve keys into foreign fields, if any diff --git a/tbl_zoom_select.php b/tbl_zoom_select.php index 7b11889..c5eebcd 100644 --- a/tbl_zoom_select.php +++ b/tbl_zoom_select.php @@ -73,7 +73,7 @@ $err_url = $goto . '?' . PMA_generate_common_url($db, $table); // Gets the list and number of fields -list($fields_list, $fields_type, $fields_collation, $fields_null) = PMA_tbl_getFields($table,$db); +list($fields_list, $fields_type, $fields_collation, $fields_null) = PMA_tbl_getFields($db, $table); $fields_cnt = count($fields_list); // retrieve keys into foreign fields, if any @@ -193,7 +193,7 @@ for ($i = 0; $i < 4; $i++) { . '<option value="' . htmlspecialchars($fc) . '">' . htmlspecialchars($fc) . '</option>'; } - } + } } // end if... else... if ($tbl_fields_null[$i]) { @@ -226,7 +226,7 @@ for ($i = 0; $i < 4; $i++) { </td><td></td> - <?php + <?php } ?> </td> @@ -269,15 +269,15 @@ for ($j = 0; $j < $fields_cnt; $j++) { <option value="<?php echo htmlspecialchars($fields_list[$j]);?>" > <?php echo htmlspecialchars($fields_list[$j]);?></option> <?php } -} +} ?> </select> </td></tr> <tr><td><label for="maxRowPlotLimit"><?php echo __("Maximum rows to plot"); ?></label></td> <td> -<?php +<?php echo '<input type="text" name="maxPlotLimit" id="maxRowPlotLimit" value="'; -if (! empty($maxPlotLimit)) { +if (! empty($maxPlotLimit)) { echo $maxPlotLimit; } else { echo $GLOBALS['cfg']['maxRowPlotLimit']; @@ -374,14 +374,14 @@ if (isset($zoom_submit) && $inputs[0] != 'pma_null' && $inputs[1] != 'pma_null' <div id='resizer' style="width:600px;height:400px"> <center> <a href="#" onClick="displayHelp();"><?php echo __('How to use'); ?></a> </center> <div id="querydata" style="display:none"> -<?php - echo json_encode($data); +<?php + echo json_encode($data); ?> </div> <div id="querychart" style="float:right"></div> </div> <?php - } + } ?> </center> <fieldset id='dataDisplay' style="display:none"> @@ -408,7 +408,7 @@ if (isset($zoom_submit) && $inputs[0] != 'pma_null' && $inputs[1] != 'pma_null' <th><?php echo PMA_getForeignFields_Values($foreigners, $foreignData, $fieldpopup, $tbl_fields_type, $i, $db, $table, $titles,$GLOBALS['cfg']['ForeignKeyMaxLimit'], '' ); ?> </th> </tr> <?php - } + } ?> </tbody> </table> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_4-17208-g66a2dc2
by Michal Čihař 25 Aug '11

25 Aug '11

The branch, master has been updated via 66a2dc25c4ac79ff99438b7d1474a7d07bc9fdb0 (commit) via 5cfb049561e297f9fe5d7166963053057da784d1 (commit) from 1b8018e4368ff5043548e25f08e915805e280e7d (commit) - Log ----------------------------------------------------------------- commit 66a2dc25c4ac79ff99438b7d1474a7d07bc9fdb0 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Aug 25 08:37:53 2011 +0200 Whitespace cleanup commit 5cfb049561e297f9fe5d7166963053057da784d1 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Aug 25 08:37:45 2011 +0200 Include sprintf for gis_data_editor.js ----------------------------------------------------------------------- Summary of changes: sql.php | 7 ++++--- tbl_change.php | 1 + tbl_select.php | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sql.php b/sql.php index 715f7f2..b233400 100644 --- a/sql.php +++ b/sql.php @@ -20,6 +20,7 @@ $GLOBALS['js_include'][] = 'tbl_change.js'; // required for GIS editor loaded via AJAX $GLOBALS['js_include'][] = 'gis_data_editor.js'; +$GLOBALS['js_include'][] = 'jquery/jquery.sprintf.js'; $GLOBALS['js_include'][] = 'jquery/jquery.svg.js'; $GLOBALS['js_include'][] = 'jquery/jquery.mousewheel.js'; $GLOBALS['js_include'][] = 'jquery/jquery.event.drag-2.0.min.js'; @@ -34,7 +35,7 @@ if (isset($_SESSION['profiling'])) { /* < IE 9 doesn't support canvas natively */ if (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER < 9) { $GLOBALS['js_include'][] = 'canvg/flashcanvas.js'; - } + } $GLOBALS['js_include'][] = 'canvg/canvg.js'; } @@ -781,7 +782,7 @@ else { $GLOBALS['js_include'][] = 'functions.js'; $GLOBALS['js_include'][] = 'makegrid.js'; $GLOBALS['js_include'][] = 'sql.js'; - + // Gets the list of fields properties if (isset($result) && $result) { $fields_meta = PMA_DBI_get_fields_meta($result); @@ -798,7 +799,7 @@ else { if (PMA_is_system_schema($db)) { $disp_mode = 'nnnn110111'; } - + $message = PMA_Message::success($message); echo PMA_showMessage($message, $GLOBALS['sql_query'], 'success'); PMA_displayTable($result, $disp_mode, $analyzed_sql); diff --git a/tbl_change.php b/tbl_change.php index 0a3e54d..6024d80 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -125,6 +125,7 @@ $GLOBALS['js_include'][] = 'jquery/timepicker.js'; // required for GIS editor $GLOBALS['js_include'][] = 'gis_data_editor.js'; +$GLOBALS['js_include'][] = 'jquery/jquery.sprintf.js'; $GLOBALS['js_include'][] = 'jquery/jquery.svg.js'; $GLOBALS['js_include'][] = 'jquery/jquery.mousewheel.js'; $GLOBALS['js_include'][] = 'jquery/jquery.event.drag-2.0.min.js'; diff --git a/tbl_select.php b/tbl_select.php index 1191c3a..b9c23d5 100644 --- a/tbl_select.php +++ b/tbl_select.php @@ -26,6 +26,7 @@ $GLOBALS['js_include'][] = 'jquery/timepicker.js'; // required for GIS editor loaded via AJAX $GLOBALS['js_include'][] = 'gis_data_editor.js'; +$GLOBALS['js_include'][] = 'jquery/jquery.sprintf.js'; $GLOBALS['js_include'][] = 'jquery/jquery.svg.js'; $GLOBALS['js_include'][] = 'jquery/jquery.mousewheel.js'; $GLOBALS['js_include'][] = 'jquery/jquery.event.drag-2.0.min.js'; @@ -310,4 +311,4 @@ else { require './sql.php'; } -?> \ No newline at end of file +?> hooks/post-receive -- phpMyAdmin

1 0