The branch, master has been updated
via ae63490dd98695bfc04b0ffff2027fae61b8414f (commit)
from cc5f5246788e08fd226472e809c818dfd57bfd80 (commit)
- Log -----------------------------------------------------------------
commit ae63490dd98695bfc04b0ffff2027fae61b8414f
Author: Michal Čihař <michal(a)cihar.com>
Date: Thu Apr 22 20:38:43 2010 +0200
Can not unset is_insert here, it is used later.
-----------------------------------------------------------------------
Summary of changes:
tbl_replace.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/tbl_replace.php b/tbl_replace.php
index f19049b..3758811 100644
--- a/tbl_replace.php
+++ b/tbl_replace.php
@@ -335,7 +335,7 @@ if ($is_insert && count($value_sets) > 0) {
require './' . PMA_securePath($goto_include);
exit;
}
-unset($me_fields, $is_insert, $is_insertignore);
+unset($me_fields, $is_insertignore);
/**
* Executes the sql query and get the result, then move back to the calling
hooks/post-receive
--
phpMyAdmin
The branch, master has been updated
via c1f536637b6d7a8b8a5bacef6baa4f779100942d (commit)
via 5951117ea1ab526ff64afd3e21323c975c22b312 (commit)
from 9978dddea23153eaa11e03c1c7145729a5e58229 (commit)
- Log -----------------------------------------------------------------
commit c1f536637b6d7a8b8a5bacef6baa4f779100942d
Author: Michal Čihař <michal(a)cihar.com>
Date: Thu Apr 22 20:25:13 2010 +0200
All logic can be done in single if.
We should also check if [0] element is set.
commit 5951117ea1ab526ff64afd3e21323c975c22b312
Author: Michal Čihař <michal(a)cihar.com>
Date: Thu Apr 22 20:23:45 2010 +0200
These values are initialized to 0, no need to explicitely reset them.
-----------------------------------------------------------------------
Summary of changes:
server_synchronize.php | 22 ++++++----------------
1 files changed, 6 insertions(+), 16 deletions(-)
diff --git a/server_synchronize.php b/server_synchronize.php
index b263ba2..afa7cce 100644
--- a/server_synchronize.php
+++ b/server_synchronize.php
@@ -288,26 +288,16 @@ if ((isset($_REQUEST['submit_connect']))) {
/**
* Calculating the number of updates for each matching table
*/
- if (isset($update_array[$i])) {
- if (isset($update_array[$i][0][$matching_tables_keys[$i][0]])) {
- $num_of_updates = sizeof($update_array[$i]);
- } else {
- $num_of_updates = 0;
- }
- } else {
- $num_of_updates = 0;
+ if (isset($update_array[$i]) && isset($update_array[$i][0]) &&
+ isset($update_array[$i][0][$matching_tables_keys[$i][0]])) {
+ $num_of_updates = sizeof($update_array[$i]);
}
/**
* Calculating the number of insertions for each matching table
*/
- if (isset($insert_array[$i])) {
- if (isset($insert_array[$i][0][$matching_tables_keys[$i][0]])) {
- $num_of_insertions = sizeof($insert_array[$i]);
- } else {
- $num_of_insertions = 0;
- }
- } else {
- $num_of_insertions = 0;
+ if (isset($insert_array[$i]) && isset($insert_array[$i][0]) &&
+ isset($insert_array[$i][0][$matching_tables_keys[$i][0]])) {
+ $num_of_insertions = sizeof($insert_array[$i]);
}
/**
* Displays the name of the matching table
hooks/post-receive
--
phpMyAdmin
The branch, master has been updated
via e7f528e0b7f5c9c370cd657e60c5f251353c87a1 (commit)
via 6f5267e68ddbb116b18c36d750e2d94e7258991b (commit)
via f946775a6a5cd56baf784ef9ec71a323aca6b142 (commit)
from a293cda14ef5a9f360e293ab6d46216af55463f0 (commit)
- Log -----------------------------------------------------------------
commit e7f528e0b7f5c9c370cd657e60c5f251353c87a1
Author: Michal Čihař <michal(a)cihar.com>
Date: Thu Apr 22 20:16:26 2010 +0200
Avoid using split which is deprecated.
commit 6f5267e68ddbb116b18c36d750e2d94e7258991b
Author: Michal Čihař <michal(a)cihar.com>
Date: Thu Apr 22 20:14:32 2010 +0200
Fix typo.
commit f946775a6a5cd56baf784ef9ec71a323aca6b142
Author: Michal Čihař <michal(a)cihar.com>
Date: Thu Apr 22 20:13:38 2010 +0200
Revert description to match reality, thanks to Marc for spotting this.
-----------------------------------------------------------------------
Summary of changes:
Documentation.html | 3 +--
po/cs.po | 4 ++--
server_synchronize.php | 8 ++++----
3 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/Documentation.html b/Documentation.html
index a928301..4bf19ed 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -4512,8 +4512,7 @@ the source and target corresponding tables.
<p>
The difference is depicted by the red and green buttons with S and D
letters, indicating that either Structure or Data are not up to date. By
-clicking on them, they will turn grey, what means that no
-synchronisation will be done.
+clicking on them, they will turn grey, what means that they will be synchronised.
</p>
<!-- DEVELOPERS -->
diff --git a/po/cs.po b/po/cs.po
index d633522..04eb1f8 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -3659,7 +3659,7 @@ msgstr "Stav podřízeného"
#: libraries/messages.inc.php:808
msgid "Synchronize databases with master"
-msgstr "Synchronovat databáze s nadřízeným"
+msgstr "Synchronizovat databáze s nadřízeným"
#: libraries/messages.inc.php:809
msgid "Unable to change master"
@@ -4976,7 +4976,7 @@ msgstr ""
#: libraries/messages.inc.php:1071
msgid "Synchronize Databases"
-msgstr "Synchronovat databáze"
+msgstr "Synchronizovat databáze"
#: libraries/messages.inc.php:1072
msgid "Synchronize"
diff --git a/server_synchronize.php b/server_synchronize.php
index 440103d..ba905d3 100644
--- a/server_synchronize.php
+++ b/server_synchronize.php
@@ -535,20 +535,20 @@ if (isset($_REQUEST['Table_ids'])) {
for ($i = 0; isset($_REQUEST[$i]); $i++ ) {
if (isset($_REQUEST[$i])) {
- $table_id = split("US", $_REQUEST[$i]);
+ $table_id = explode("US", $_REQUEST[$i]);
if (isset($table_id[1])) {
$uncommon_table_structure_diff[] = $table_id[1];
}
- $table_id = split("UD", $_REQUEST[$i]);
+ $table_id = explode("UD", $_REQUEST[$i]);
if (isset($table_id[1])) {
$uncommon_table_data_diff[] = $table_id[1];
}
- $table_id = split("MS", $_REQUEST[$i]);
+ $table_id = explode("MS", $_REQUEST[$i]);
if (isset($table_id[1])) {
$matching_table_structure_diff[] = $table_id[1];
}
- $table_id = split("MD", $_REQUEST[$i]);
+ $table_id = explode("MD", $_REQUEST[$i]);
if (isset($table_id[1])) {
$matching_table_data_diff[] = $table_id[1];
}
hooks/post-receive
--
phpMyAdmin
The branch, master has been updated
via a293cda14ef5a9f360e293ab6d46216af55463f0 (commit)
from a3d19e0c906d56d6c489186e416b2f4328a8135a (commit)
- Log -----------------------------------------------------------------
commit a293cda14ef5a9f360e293ab6d46216af55463f0
Author: Marc Delisle <marc(a)infomarc.info>
Date: Thu Apr 22 12:57:40 2010 -0400
Clarify the text
-----------------------------------------------------------------------
Summary of changes:
Documentation.html | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Documentation.html b/Documentation.html
index 09856b6..a928301 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -4479,12 +4479,12 @@ tables of the databases can also be synchronized.
You need to fill in the host name of the server, the username and
password of an user account already there in MySQL. Port is by default
populated with 3306 (MySQL default port). Then the name of the database
-should be mentioned at the end.All the information other than the port
+should be mentioned at the end. All the information other than the port
needs to be filled explicitly for the source as well as target servers.
</p>
<p>
-After successfully by passing authentication phase, the source and
+After successfully passing through the authentication phase, the source and
target database table names will be displayed. It will be a tabular
representation.
</p>
@@ -4493,8 +4493,8 @@ representation.
On the left, are listed the source database table names. Some of the
names have a ‘+’ plus sign preceding them. This shows that these tables
are only present in source database and they need to be added to the
-target database in order to synchronize the target database.While those
-table name that are not preceded by a ‘+’ sign are also present in
+target database in order to synchronize the target database. The tables
+whose names are not preceded by a ‘+’ sign are already present in the
target database.
</p>
@@ -4511,7 +4511,7 @@ the source and target corresponding tables.
<p>
The difference is depicted by the red and green buttons with S and D
-letters. Indicating that either Structure or Data are not up to date. By
+letters, indicating that either Structure or Data are not up to date. By
clicking on them, they will turn grey, what means that no
synchronisation will be done.
</p>
hooks/post-receive
--
phpMyAdmin