Merge pull request #9090 from seamuslee001/CRM-18006

CRM-18006 Change temporary tables to use InnoDB engine

diff --git a/CRM/Core/BAO/CustomField.php b/CRM/Core/BAO/CustomField.php
index dbcf6da3ed8838e3b6ab93a60210ed767316b876..4bdcacc0fa8027d1ffff466f007872bd4f783a68 100644 (file)
--- a/CRM/Core/BAO/CustomField.php
+++ b/CRM/Core/BAO/CustomField.php
@@ -822,7 +822,6 @@ class CRM_Core_BAO_CustomField extends CRM_Core_DAO_CustomField {
       'AdvMulti-Select',
       'CheckBox',
       'Radio',
-      'Autocomplete-Select',
     )));
 
     if ($isSelect) {

diff --git a/CRM/Core/Form/Renderer.php b/CRM/Core/Form/Renderer.php
index 47ee1534c6aa53fa36d63f124c1cec3ebb9649d5..1535fd111e5409e8be191303ae408df4b05f89ee 100644 (file)
--- a/CRM/Core/Form/Renderer.php
+++ b/CRM/Core/Form/Renderer.php
@@ -125,9 +125,9 @@ class CRM_Core_Form_Renderer extends HTML_QuickForm_Renderer_ArraySmarty {
         $date .= ($element->getAttribute('timeformat')) ? " $time" : '';
         $el['html'] = $date . '<input type="hidden" value="' . $element->getValue() . '" name="' . $element->getAttribute('name') . '">';
       }
-      if ($el['name'] == 'details') {
-        $el['html'] = str_replace('<br />', '', $el['html']);
-        $el['html'] = '<span class="crm-frozen-field">' . html_entity_decode($el['html']) . '</span>';
+      // Render html for wysiwyg textareas
+      if ($el['type'] == 'textarea' && isset($element->_attributes['class']) && strstr($element->_attributes['class'], 'wysiwyg')) {
+        $el['html'] = '<span class="crm-frozen-field">' . $el['value'] . '</span>';
       }
       else {
         $el['html'] = '<span class="crm-frozen-field">' . $el['html'] . '</span>';

diff --git a/distmaker/dists/common.sh b/distmaker/dists/common.sh
index 1aa2090e438ded15abb5e8ced5fe6a823912f00f..b3096060cec14cb96fd9b297232ebfc4abcd5a05 100644 (file)
--- a/distmaker/dists/common.sh
+++ b/distmaker/dists/common.sh
@@ -69,8 +69,8 @@ function dm_install_core() {
     [ -d "$repo/$dir" ] && dm_install_dir "$repo/$dir" "$to/$dir"
   done
 
-  dm_install_files "$repo" "$to" {agpl-3.0,agpl-3.0.exception,gpl,README,CONTRIBUTORS}.txt
-  dm_install_files "$repo" "$to" composer.json composer.lock bower.json package.json Civi.php
+  dm_install_files "$repo" "$to" {agpl-3.0,agpl-3.0.exception,gpl,CONTRIBUTORS}.txt
+  dm_install_files "$repo" "$to" composer.json composer.lock bower.json package.json Civi.php README.md
 
   mkdir -p "$to/sql"
   pushd "$repo" >> /dev/null

diff --git a/install/index.php b/install/index.php
index b47c9f2b48897e420dbe75a4561b3b0f16df5d51..5634dd26b48d8e73e54a9ef32ffa995440221a95 100644 (file)
--- a/install/index.php
+++ b/install/index.php
@@ -565,7 +565,7 @@ class InstallRequirements {
     ));
 
     // Check that we can identify the root folder successfully
-    $this->requireFile($crmPath . CIVICRM_DIRECTORY_SEPARATOR . 'README.txt',
+    $this->requireFile($crmPath . CIVICRM_DIRECTORY_SEPARATOR . 'README.md',
       array(
         ts("File permissions"),
         ts("Does the webserver know where files are stored?"),