[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA4-389-g54942a7
Michal Čihař
nijel at users.sourceforge.net
Fri Mar 18 14:55:53 CET 2011
The branch, master has been updated
via 54942a7cf0802f313caa10740941fce6443bbbf1 (commit)
via 0e63bd04874accd13eaa83bade8f28c937b01f40 (commit)
via 5f1f0a8bdba101444067470b23b8e82ba422f83d (commit)
via 24396fe0244bb8e17315b3c3d9bd71f2835dd041 (commit)
via 7899b0f199acc67214598b30bdd1b78544656063 (commit)
from 13f919da6ad9217e5cc349d2501782fbf7291749 (commit)
- Log -----------------------------------------------------------------
commit 54942a7cf0802f313caa10740941fce6443bbbf1
Author: Michal Čihař <mcihar at novell.com>
Date: Fri Mar 18 14:55:42 2011 +0100
Fix typo
commit 0e63bd04874accd13eaa83bade8f28c937b01f40
Author: Michal Čihař <mcihar at novell.com>
Date: Fri Mar 18 14:55:27 2011 +0100
Fix multi submits for MSIE with <input type="image"..
commit 5f1f0a8bdba101444067470b23b8e82ba422f83d
Author: Michal Čihař <mcihar at novell.com>
Date: Fri Mar 18 14:53:05 2011 +0100
Forgotten use of translated string
commit 24396fe0244bb8e17315b3c3d9bd71f2835dd041
Author: Michal Čihař <mcihar at novell.com>
Date: Fri Mar 18 14:52:08 2011 +0100
There are no empty/drop tabs anymore
commit 7899b0f199acc67214598b30bdd1b78544656063
Author: Michal Čihař <mcihar at novell.com>
Date: Fri Mar 18 14:48:55 2011 +0100
Avoid comparing translated strings and simplify the code.
-----------------------------------------------------------------------
Summary of changes:
db_structure.php | 2 +-
libraries/common.lib.php | 5 +----
libraries/mult_submits.inc.php | 4 ++--
tbl_structure.php | 16 ++++++++--------
tbl_tracking.php | 11 ++++++-----
5 files changed, 18 insertions(+), 20 deletions(-)
diff --git a/db_structure.php b/db_structure.php
index 03a31be..d81af5d 100644
--- a/db_structure.php
+++ b/db_structure.php
@@ -501,7 +501,7 @@ echo ' <option value="' . __('With selected:') . '" selected="selected">'
. __('With selected:') . '</option>' . "\n";
echo ' <option value="export" >'
. __('Export') . '</option>' . "\n";
-echo ' <option value="' . __('Print view') . '" >'
+echo ' <option value="print" >'
. __('Print view') . '</option>' . "\n";
if (!$db_is_information_schema) {
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index 7451df4..bea2c65 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -1660,10 +1660,7 @@ function PMA_generate_html_tab($tab, $url_params = array())
// determine additionnal style-class
if (empty($tab['class'])) {
- if ($tab['text'] == __('Empty')
- || $tab['text'] == __('Drop')) {
- $tab['class'] = 'caution';
- } elseif (! empty($tab['active'])
+ if (! empty($tab['active'])
|| PMA_isValid($GLOBALS['active_page'], 'identical', $tab['link'])) {
$tab['class'] = 'active';
} elseif (is_null($tab['active']) && empty($GLOBALS['active_page'])
diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php
index e566576..665b76d 100644
--- a/libraries/mult_submits.inc.php
+++ b/libraries/mult_submits.inc.php
@@ -24,7 +24,7 @@ if (! empty($submit_mult)
$what = 'drop_db';
} elseif (isset($selected_tbl) && !empty($selected_tbl)) {
// coming from database structure view - do something with selected tables
- if ($submit_mult == __('Print view')) {
+ if ($submit_mult == 'print') {
require './tbl_printview.php';
} else {
$selected = $selected_tbl;
@@ -100,7 +100,7 @@ if (! empty($submit_mult)
// this should already be handled by tbl_structure.php
}
} else {
- // coming from borwsing - do something with selected rows
+ // coming from browsing - do something with selected rows
$what = 'row_delete';
$selected = $rows_to_delete;
}
diff --git a/tbl_structure.php b/tbl_structure.php
index 18eedee..73a45fc 100644
--- a/tbl_structure.php
+++ b/tbl_structure.php
@@ -21,19 +21,19 @@ $GLOBALS['js_include'][] = 'tbl_structure.js';
* submit_mult_*_x comes from IE if <input type="img" ...> is used
*/
if (isset($_REQUEST['submit_mult_change_x'])) {
- $submit_mult = __('Change');
+ $submit_mult = 'change';
} elseif (isset($_REQUEST['submit_mult_drop_x'])) {
- $submit_mult = __('Drop');
+ $submit_mult = 'drop';
} elseif (isset($_REQUEST['submit_mult_primary_x'])) {
- $submit_mult = __('Primary');
+ $submit_mult = 'primary';
} elseif (isset($_REQUEST['submit_mult_index_x'])) {
- $submit_mult = __('Index');
+ $submit_mult = 'index';
} elseif (isset($_REQUEST['submit_mult_unique_x'])) {
- $submit_mult = __('Unique');
+ $submit_mult = 'unique';
} elseif (isset($_REQUEST['submit_mult_fulltext_x'])) {
- $submit_mult = __('Fulltext');
+ $submit_mult = 'ftext';
} elseif (isset($_REQUEST['submit_mult_browse_x'])) {
- $submit_mult = __('Browse');
+ $submit_mult = 'browse';
} elseif (isset($_REQUEST['submit_mult'])) {
$submit_mult = $_REQUEST['submit_mult'];
} elseif (isset($_REQUEST['mult_btn']) && $_REQUEST['mult_btn'] == __('Yes')) {
@@ -45,7 +45,7 @@ if (isset($_REQUEST['submit_mult_change_x'])) {
if (! empty($submit_mult) && isset($_REQUEST['selected_fld'])) {
$err_url = 'tbl_structure.php?' . PMA_generate_common_url($db, $table);
- if ($submit_mult == __('Browse')) {
+ if ($submit_mult == 'browse') {
// browsing the table displaying only selected fields/columns
$GLOBALS['active_page'] = 'sql.php';
$sql_query = '';
diff --git a/tbl_tracking.php b/tbl_tracking.php
index b651986..757456b 100644
--- a/tbl_tracking.php
+++ b/tbl_tracking.php
@@ -601,11 +601,12 @@ if ($last_version > 0) {
} else {
$version_status = __('not active');
}
- if (($version['version'] == $last_version) && ($version_status == __('not active'))) {
- $tracking_active = false;
- }
- if (($version['version'] == $last_version) && ($version_status == __('active'))) {
- $tracking_active = true;
+ if ($version['version'] == $last_version){
+ if ($version['tracking_active'] == 1) {
+ $tracking_active = true;
+ } else {
+ $tracking_active = false;
+ }
}
?>
<tr class="noclick <?php echo $style;?>">
hooks/post-receive
--
phpMyAdmin
More information about the Git
mailing list