Merge branch 'master' of github.com:roundcube/roundcubemail

3 files changed, 16 insertions, 7 deletions

diff --git a/program/include/rcube_config.php b/program/include/rcube_config.php
index 34c61c58d..1b621e0fc 100644
--- a/program/include/rcube_config.php
+++ b/program/include/rcube_config.php
@@ -71,10 +71,14 @@ class rcube_config
         $this->load_host_config();
 
         // set skin (with fallback to old 'skin_path' property)
-        if (empty($this->prop['skin']) && !empty($this->prop['skin_path']))
-            $this->prop['skin'] = str_replace('skins/', '', unslashify($this->prop['skin_path']));
-        else if (empty($this->prop['skin']))
-            $this->prop['skin'] = 'default';
+        if (empty($this->prop['skin'])) {
+            if (!empty($this->prop['skin_path'])) {
+                $this->prop['skin'] = str_replace('skins/', '', unslashify($this->prop['skin_path']));
+            }
+            else {
+                $this->prop['skin'] = 'default';
+            }
+        }
 
         // fix paths
         $this->prop['log_dir'] = $this->prop['log_dir'] ? realpath(unslashify($this->prop['log_dir'])) : INSTALL_PATH . 'logs';
diff --git a/program/include/rcube_ldap.php b/program/include/rcube_ldap.php
index f799df2bb..8f23a406b 100644
--- a/program/include/rcube_ldap.php
+++ b/program/include/rcube_ldap.php
@@ -1191,8 +1191,11 @@ class rcube_ldap extends rcube_addressbook
                     else if ($val == '') {
                         // Field supplied is empty, verify that it is not required.
                         if (!in_array($fld, $this->prop['required_fields'])) {
-                            // It is not, safe to clear.
-                            $deletedata[$fld] = $old_data[$fld];
+                            // ...It is not, safe to clear.
+                            // #1488420: Workaround "ldap_mod_del(): Modify: Inappropriate matching in..."
+                            // jpegPhoto attribute require an array() here. It looks to me that it works for other attribs too
+                            $deletedata[$fld] = array();
+                            //$deletedata[$fld] = $old_data[$fld];
                         }
                     }
                     else {
diff --git a/program/include/rcube_output_html.php b/program/include/rcube_output_html.php
index fce9615cf..7ceea1839 100644
--- a/program/include/rcube_output_html.php
+++ b/program/include/rcube_output_html.php
@@ -68,7 +68,9 @@ class rcube_output_html extends rcube_output
         $this->set_env('x_frame_options', $this->config->get('x_frame_options', 'sameorigin'));
 
         // load the correct skin (in case user-defined)
-        $this->set_skin($this->config->get('skin'));
+        $skin = $this->config->get('skin');
+        $this->set_skin($skin);
+        $this->set_env('skin', $skin);
 
         // add common javascripts
         $this->add_script('var '.rcmail::JS_OBJECT_NAME.' = new rcube_webmail();', 'head_top');