updated search_api, search_api_solr_override, imce

sites/all/modules/contrib/files/imce/imce/imce.info

@@ -4,9 +4,9 @@ core = "7.x"
 package = "Media"
 configure = "admin/config/media/imce"
 
-; Information added by Drupal.org packaging script on 2016-03-30
-version = "7.x-1.10"
+; Information added by Drupal.org packaging script on 2017-05-27
+version = "7.x-1.11"
 core = "7.x"
 project = "imce"
-datestamp = "1459346870"
+datestamp = "1495890787"
 

sites/all/modules/contrib/files/imce/imce/imce.install

@@ -25,6 +25,7 @@ function imce_uninstall() {
   variable_del('imce_settings_replace');
   variable_del('imce_settings_thumb_method');
   variable_del('imce_settings_disable_private');
+  variable_del('imce_settings_admin_theme');
   variable_del('imce_custom_content');
   variable_del('imce_custom_process');
   variable_del('imce_custom_init');

sites/all/modules/contrib/files/imce/imce/imce.module

@@ -46,6 +46,20 @@ function imce_menu() {
   return $items;
 }
 
+/**
+ * Implements hook_admin_paths().
+ */
+function imce_admin_paths() {
+  if (variable_get('imce_settings_admin_theme', FALSE)) {
+    return array(
+      'imce' => TRUE,
+      'imce/*' => TRUE,
+      'file/imce/*' => TRUE,
+      'imce-filefield/*' => TRUE,
+    );
+  }
+}
+
 /**
  * Implements hook_permission().
  */

sites/all/modules/contrib/files/imce/imce/inc/imce.admin.inc

@@ -109,6 +109,12 @@ function imce_admin_form($form, &$form_state) {
     '#default_value' => variable_get('imce_settings_disable_private', 1),
     '#description' => t('IMCE serves all files under private files directory without applying any access restrictions. This allows anonymous access to any file(/system/files/filename) unless there is a module restricting access to the files. Here you can disable this feature.'),
   );
+  $form['common']['admin_theme'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Use admin theme for IMCE paths'),
+    '#default_value' => variable_get('imce_settings_admin_theme', FALSE),
+    '#description' => t('If you have user interface issues with the active theme you may consider switching to admin theme.'),
+  );
 
   $form['submit'] = array('#type' => 'submit', '#value' => t('Save configuration'));
   $form['#theme'] = 'imce_admin';
@@ -183,6 +189,7 @@ function imce_admin_submit($form, &$form_state) {
   variable_set('imce_settings_replace', $form_state['values']['replace']);
   variable_set('imce_settings_thumb_method', $form_state['values']['thumb_method']);
   variable_set('imce_settings_disable_private', $form_state['values']['disable_private']);
+  variable_set('imce_settings_admin_theme', $form_state['values']['admin_theme']);
   drupal_set_message(t('Changes have been saved.'));
 }
 

sites/all/modules/contrib/files/imce/imce/js/imce.js

@@ -801,12 +801,17 @@ updateUI: function() {
   if (furl.charAt(furl.length - 1) != '/') {
     furl = imce.conf.furl = furl + '/';
   }
-  imce.conf.modfix = imce.conf.clean && furl.indexOf(host + '/system/') > -1;
+  imce.conf.modfix = imce.conf.clean && furl.split('/')[3] === 'system';
   if (absurls && !isabs) {
     imce.conf.furl = baseurl + furl;
   }
   else if (!absurls && isabs && furl.indexOf(baseurl) == 0) {
-    imce.conf.furl = furl.substr(baseurl.length);
+    furl = furl.substr(baseurl.length);
+    // Server base url is defined with a port which is missing in current page url.
+    if (furl.charAt(0) === ':') {
+      furl = furl.replace(/^:\d*/, '');
+    }
+    imce.conf.furl = furl;
   }
   //convert button elements to input elements.
   imce.convertButtons(imce.FW);