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@cihar.com Date: Thu Apr 22 20:16:26 2010 +0200

Avoid using split which is deprecated.

commit 6f5267e68ddbb116b18c36d750e2d94e7258991b Author: Michal Čihař michal@cihar.com Date: Thu Apr 22 20:14:32 2010 +0200

Fix typo.

commit f946775a6a5cd56baf784ef9ec71a323aca6b142 Author: Michal Čihař michal@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