From 8603bbba2e0bb3dfe171c0241bf97ab7ef9575fc Mon Sep 17 00:00:00 2001 From: thomascube Date: Sun, 26 Sep 2010 11:17:03 +0000 Subject: Fix base url resolution + better order for condition checks in rcube_mdb2 + updated changelog --- program/include/rcube_mdb2.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'program/include/rcube_mdb2.php') diff --git a/program/include/rcube_mdb2.php b/program/include/rcube_mdb2.php index 0769b635e..a2baf33c0 100644 --- a/program/include/rcube_mdb2.php +++ b/program/include/rcube_mdb2.php @@ -123,16 +123,16 @@ class rcube_mdb2 { // Already connected if ($this->db_connected) { + // connected to read-write db, current connection is ok + if ($this->db_mode == 'w') + return; + // no replication, current connection is ok for read and write if (empty($this->db_dsnr) || $this->db_dsnw == $this->db_dsnr) { $this->db_mode = 'w'; return; } - // connected to read-write db, current connection is ok - if ($this->db_mode == 'w') - return; - // Same mode, current connection is ok if ($this->db_mode == $mode) return; -- cgit v1.2.3