diff options
| author | Piotr Przybylski <piotrprz@gmail.com> | 2011-07-22 13:07:04 +0400 |
|---|---|---|
| committer | Piotr Przybylski <piotrprz@gmail.com> | 2011-07-22 13:07:04 +0400 |
| commit | 3586bb992f0e6c325207dc55bd01c1f3607f0b31 (patch) | |
| tree | 8152d54c4ae7e92c342bf1f5e2126fee22ecdbdb /server_databases.php | |
| parent | 74a00a110f6d15d24b5b40c02ec8a3916a6acd15 (diff) | |
| parent | d8f6e7da389da4ff99435dea358b713af116f9e1 (diff) | |
Merge remote-tracking branch 'origin/master' into drizzle
Conflicts:
db_structure.php
libraries/database_interface.lib.php
libraries/server_synchronize.lib.php
server_status.php
sql.php
Diffstat (limited to 'server_databases.php')
| -rw-r--r-- | server_databases.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/server_databases.php b/server_databases.php index 41374717d0..2ec0e73688 100644 --- a/server_databases.php +++ b/server_databases.php @@ -185,7 +185,7 @@ if ($databases_count > 0) { { if ($type=="master") $name = __('Master replication'); - elseif($type == "slave") + elseif ($type == "slave") $name = __('Slave replication'); if (${"server_{$type}_status"}) echo ' <th>'. $name .'</th>' . "\n"; |