Changeset 3993 in subversion

Timestamp:

Sep 26, 2010 7:17:03 AM (3 years ago)

Author:

thomasb

Message:

Fix base url resolution + better order for condition checks in rcube_mdb2 + updated changelog

Location:

trunk/roundcubemail

Files:

• CHANGELOG (modified) (1 diff)
• program/include/rcube_mdb2.php (modified) (2 diffs)
• program/include/rcube_shared.inc (modified) (1 diff)

trunk/roundcubemail/CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- Make alias setting in squirrelmail_usercopy plugin configurable (patch by pommi, #1487007)
 - Prevent from saving a non-existing skin path in user prefs (#1486936)
 - Improve handling of single-part messages with bogus BODYSTRUCTURE (#1486898)

trunk/roundcubemail/program/include/rcube_mdb2.php

@@ -124 +124 @@
         // 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) {
@@ -129 +133 @@
                 return;
             }
-
-            // connected to read-write db, current connection is ok
-            if ($this->db_mode == 'w')
-                return;
 
             // Same mode, current connection is ok

trunk/roundcubemail/program/include/rcube_shared.inc

@@ -228 +228 @@
   if (strrpos($base_url, '/')>7)
   {
-    $host_url = substr($base_url, 0, strpos($base_url, '/'));
+    $host_url = substr($base_url, 0, strpos($base_url, '/', 7));
     $base_url = substr($base_url, 0, strrpos($base_url, '/'));
   }