Merging 8.0.3 into develop

CHANGELOG.md

@@ -1,3 +1,24 @@
+# 8.0.3
+
+## Behavioral Improvements
+
+* Fixed rendering of fatal errors so that it uses the proper stylesheets.
+
+## Bug Fixes
+
+* Fixed bug where activating a theme only changed the home page.
+* Fixed error where all pages added to a multilingual site were showing as system pages.
+* Fixed bug where attributes in the application/attributes directory couldn’t be installed.
+* Bug fixes with attribute validation.
+* Fixed error exception when creating a new page type failed validation
+* Fixed bug where Express Forms could not be added on sites that were upgraded from 5.7.
+* File Date modified in file manager now shows the proper date (instead of the date added)
+* Fixed bug where attempting to delete Express entries or entities that had values attached to express attribute types would trigger an error.
+* Attribute search fields in advanced search dialogs now select their options properly.
+* Fix misnamed config value concrete.file\_manager.images.use\_exif\_data\_to\_rotate\_images (was named concrete.file\_manager.images.use\_exim\_data\_to\_rotate\_images)
+* Fix bug with Legacy Form not being able to be saved under certain conditions.
+* Fixed: Entering a new Express Data Object with the existing Handle will cause error
+
 # 8.0.2
 
 ## New Features
@@ -27,7 +48,7 @@
 * Fixed inability to sort attribute sets, bugs with editing legacy attribute sets.
 * Fixed problems with saving legacy attributes.
 * Made file manager behave better in cases where a file record somehow had no versions.
-* Fixed error where adding a form block would fail intermittently 
+* Fixed error where adding a form block would fail intermittently
 * Fixed typos in the automatically generated Nginx configuration for pretty URL handling (thanks chemett)
 
 # 8.0
@@ -180,6 +201,16 @@ In addition to the credits above, the following users have been very helpful fix
 
 Edtrist, mlocati, MrKarlDilkington
 
+# 5.7.5.13 Release Notes
+
+## Bug Fixes
+
+* Once again, Environment Information is now available in the Dashboard.
+
+## Developer Updates
+
+* Added jQuery Select to Dropdown menu support in the Dashboard; just add data-select=”bootstrap” to your select menus.
+
 # 5.7.5.12
 
 ## Bug Fixes

application/bootstrap/app.php

@@ -1,5 +1,9 @@
 <?php
 
+$classLoader = new \Symfony\Component\ClassLoader\Psr4ClassLoader();
+$classLoader->addPrefix('PropCo', DIR_APPLICATION . '/' . DIRNAME_CLASSES . '/PropCo');
+$classLoader->register();
+
 /*
  * ----------------------------------------------------------------------------
  * # Custom Application Handler

build/tasks/build-release/download.js

@@ -1,7 +1,7 @@
 /* jshint unused:vars, undef:true, node:true */
 
 module.exports = function(grunt, config, parameters, done) {
-	var zipUrl = parameters.releaseSourceZip || 'https://github.com/concrete5/concrete5/archive/release/8.0.2.zip';
+	var zipUrl = parameters.releaseSourceZip || 'https://github.com/concrete5/concrete5/archive/release/8.0.3.zip';
 	var workFolder = parameters.releaseWorkFolder || './release';
 	function endForError(e) {
 		process.stderr.write(e.message || e);

concrete/attributes/address/controller.php

@@ -32,6 +32,11 @@ public function searchKeywords($keywords, $queryBuilder)
         );
     }
 
+    public function getAttributeValueClass()
+    {
+        return AddressValue::class;
+    }
+
     public function getAttributeValueObject()
     {
         return $this->entityManager->find(AddressValue::class, $this->attributeValue->getGenericValue());
@@ -211,11 +216,6 @@ public function exportKey($akey)
         return $akey;
     }
 
-    protected function retrieveAttributeKeySettings()
-    {
-        return $this->entityManager->find(AddressSettings::class, $this->attributeKey);
-    }
-
     public function exportValue(\SimpleXMLElement $akn)
     {
         $avn = $akn->addChild('value');
@@ -349,8 +349,8 @@ public function form()
         $this->set('key', $this->attributeKey);
     }
 
-    public function createAttributeKeySettings()
+    public function getAttributeKeySettingsClass()
     {
-        return new AddressSettings();
+        return AddressSettings::class;
     }
 }

concrete/attributes/boolean/controller.php

@@ -131,11 +131,10 @@ public function saveKey($data)
         return $type;
     }
 
-    public function getAttributeValueObject()
+    public function getAttributeValueClass()
     {
-        return $this->entityManager->find(BooleanValue::class, $this->attributeValue->getGenericValue());
+        return BooleanValue::class;
     }
-
     public function createAttributeValueFromRequest()
     {
         $data = $this->post();
@@ -149,14 +148,9 @@ public function validateForm($data)
         return isset($data['value']) && $data['value'] == 1;
     }
 
-    public function createAttributeKeySettings()
-    {
-        return new BooleanSettings();
-    }
-
-    protected function retrieveAttributeKeySettings()
+    public function getAttributeKeySettingsClass()
     {
-        return $this->entityManager->find(BooleanSettings::class, $this->attributeKey);
+        return BooleanSettings::class;
     }
 
 }

concrete/attributes/date_time/controller.php

@@ -137,9 +137,9 @@ public function search()
         echo $html;
     }
 
-    public function getAttributeValueObject()
+    public function getAttributeValueClass()
     {
-        return $this->entityManager->find(DateTimeValue::class, $this->attributeValue->getGenericValue());
+        return DateTimeValue::class;
     }
 
     public function createAttributeValue($value)
@@ -188,14 +188,9 @@ protected function load()
         $this->set('akDateDisplayMode', $this->akDateDisplayMode);
     }
 
-    public function createAttributeKeySettings()
+    public function getAttributeKeySettingsClass()
     {
-        return new DateTimeSettings();
-    }
-
-    protected function retrieveAttributeKeySettings()
-    {
-        return $this->entityManager->find(DateTimeSettings::class, $this->attributeKey);
+        return DateTimeSettings::class;
     }
 
 }

concrete/attributes/express/controller.php

@@ -18,9 +18,9 @@ public function getIconFormatter()
         return new FontAwesomeIconFormatter('database');
     }
 
-    public function getAttributeValueObject()
+    public function getAttributeValueClass()
     {
-        return $this->entityManager->find(ExpressValue::class, $this->attributeValue->getGenericValue());
+        return ExpressValue::class;
     }
 
     public function saveKey($data)
@@ -136,14 +136,9 @@ protected function load()
         $this->set('entities', $entities);
     }
 
-    public function createAttributeKeySettings()
+    public function getAttributeKeySettingsClass()
     {
-        return new ExpressSettings();
-    }
-
-    protected function retrieveAttributeKeySettings()
-    {
-        return $this->entityManager->find(ExpressSettings::class, $this->attributeKey);
+        return ExpressSettings::class;
     }
 
 }

concrete/attributes/image_file/controller.php

@@ -238,19 +238,14 @@ public function createAttributeValueFromRequest()
         return $this->createAttributeValue(null);
     }
 
-    public function getAttributeValueObject()
+    public function getAttributeValueClass()
     {
-        return $this->entityManager->find(ImageFileValue::class, $this->attributeValue->getGenericValue());
+        return ImageFileValue::class;
     }
 
-    public function createAttributeKeySettings()
+    public function getAttributeKeySettingsClass()
     {
-        return new ImageFileSettings();
-    }
-
-    protected function retrieveAttributeKeySettings()
-    {
-        return $this->entityManager->find(ImageFileSettings::class, $this->attributeKey);
+        return ImageFileSettings::class;
     }
 
 }

concrete/attributes/number/controller.php

@@ -22,9 +22,9 @@ public function getDisplayValue()
         return floatval($this->attributeValue->getValue());
     }
 
-    public function getAttributeValueObject()
+    public function getAttributeValueClass()
     {
-        return $this->entityManager->find(NumberValue::class, $this->attributeValue->getGenericValue());
+        return NumberValue::class;
     }
 
     public function searchForm($list)

concrete/attributes/rating/controller.php

@@ -19,9 +19,9 @@ public function getIconFormatter()
         return new FontAwesomeIconFormatter('star');
     }
 
-    public function getAttributeValueObject()
+    public function getAttributeValueClass()
     {
-        return $this->entityManager->find(NumberValue::class, $this->attributeValue->getGenericValue());
+        return NumberValue::class;
     }
 
     public function getDisplayValue()

concrete/attributes/select/controller.php

@@ -31,9 +31,9 @@ public function getIconFormatter()
         return new FontAwesomeIconFormatter('list-alt');
     }
 
-    public function getAttributeValueObject()
+    public function getAttributeValueClass()
     {
-        return $this->entityManager->find(SelectValue::class, $this->attributeValue->getGenericValue());
+        return SelectValue::class;
     }
 
     public function type_form()
@@ -778,14 +778,9 @@ public function getOptionDisplayOrder()
         return $this->akSelectOptionDisplayOrder;
     }
 
-    public function createAttributeKeySettings()
+    public function getAttributeKeySettingsClass()
     {
-        return new SelectSettings();
-    }
-
-    protected function retrieveAttributeKeySettings()
-    {
-        return $this->entityManager->find(SelectSettings::class, $this->attributeKey);
+        return SelectSettings::class;
     }
 
     public function getLabelID()

concrete/attributes/social_links/controller.php

@@ -23,9 +23,9 @@ public function getSearchIndexValue()
         return false;
     }
 
-    public function getAttributeValueObject()
+    public function getAttributeValueClass()
     {
-        return $this->entityManager->find(SocialLinksValue::class, $this->attributeValue->getGenericValue());
+        return SocialLinksValue::class;
     }
 
     public function createAttributeValueFromRequest()

concrete/attributes/textarea/controller.php

@@ -108,9 +108,9 @@ protected function load()
         $this->set('akTextareaDisplayMode', $type->getMode());
     }
 
-    public function getAttributeValueObject()
+    public function getAttributeValueClass()
     {
-        return $this->entityManager->find(TextValue::class, $this->attributeValue->getGenericValue());
+        return TextValue::class;
     }
 
     public function exportKey($akey)
@@ -140,14 +140,9 @@ public function importKey(\SimpleXMLElement $akey)
         return $type;
     }
 
-    public function createAttributeKeySettings()
+    public function getAttributeKeySettingsClass()
     {
-        return new TextareaSettings();
-    }
-
-    protected function retrieveAttributeKeySettings()
-    {
-        return $this->entityManager->find(TextareaSettings::class, $this->attributeKey);
+        return TextareaSettings::class;
     }
 
 }

concrete/attributes/topics/controller.php

@@ -27,9 +27,9 @@ public function getIconFormatter()
         return new FontAwesomeIconFormatter('tag');
     }
 
-    public function getAttributeValueObject()
+    public function getAttributeValueClass()
     {
-        return $this->entityManager->find(TopicsValue::class, $this->attributeValue->getGenericValue());
+        return TopicsValue::class;
     }
 
     public function filterByAttribute(AttributedItemList $list, $value, $comparison = '=')
@@ -370,14 +370,9 @@ public function duplicateKey($newAK)
         );
     }
 
-    public function createAttributeKeySettings()
+    public function getAttributeKeySettingsClass()
     {
-        return new TopicsSettings();
-    }
-
-    protected function retrieveAttributeKeySettings()
-    {
-        return $this->entityManager->find(TopicsSettings::class, $this->attributeKey);
+        return TopicsSettings::class;
     }
 
 }

concrete/blocks/form/form_setup_html.php

@@ -22,7 +22,7 @@
 <?php /* these question ids have been deleted, or edited, and so shouldn't be duplicated for block versioning */ ?>
 <input type="hidden" id="ccm-ignoreQuestionIDs" name="ignoreQuestionIDs" value="" />
 <input type="hidden" id="ccm-pendingDeleteIDs" name="pendingDeleteIDs" value="" />
-<input type="hidden" id="qsID" name="qsID" type="text" value="<?php echo intval($miniSurveyInfoset['questionSetId'])?>" />
+<input type="hidden" id="qsID" name="qsID" type="text" value="<?php echo intval($miniSurveyInfo['questionSetId'])?>" />
 <input type="hidden" id="oldQsID" name="oldQsID" type="text" value="<?php echo intval($miniSurveyInfo['questionSetId'])?>" />
 <input type="hidden" id="msqID" name="msqID" type="text" value="<?php echo intval($msqID)?>" />
 

concrete/config/concrete.php

@@ -9,7 +9,7 @@
      */
     'version' => '8.1.0a1',
     'version_installed' => '8.1.0a1',
-    'version_db' => '20161210000000', // the key of the latest database migration
+    'version_db' => '20161216100000', // the key of the latest database migration
 
     /*
      * Installation status
@@ -492,7 +492,7 @@
 
     'file_manager' => array(
         'images' => array(
-            'use_exim_data_to_rotate_images' => false,
+            'use_exif_data_to_rotate_images' => false,
             'manipulation_library' => 'gd'
         ),
         'results' => 10