Merge pull request #159 from fivejars/master

1.5.2 preparation
ymcatwincities · Sep 29, 2021 · 3fb5a6b · 3fb5a6b
2 parents f67ab25 + 63b35c1
commit 3fb5a6b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/js/gated-content/dist/gated-content.css b/js/gated-content/dist/gated-content.css
diff --git a/js/gated-content/src/scss/components/_add-to-calendar.scss b/js/gated-content/src/scss/components/_add-to-calendar.scss
@@ -1,7 +1,6 @@
 .add-to-calendar {
   button {
     margin-right:     10px;
-    outline:          none;
     border:           2px solid $concrete;
     border-radius:    50%;
     background-color: $white;
@@ -10,6 +9,10 @@
     height:           50px;
     line-height:      1px;
     font-size:        18px;
+
+    &:focus {
+      outline:        none;
+    }
   }
 
   .dropdown-menu {

diff --git a/modules/openy_gc_log/src/Plugin/views/field/GCLogDayField.php b/modules/openy_gc_log/src/Plugin/views/field/GCLogDayField.php
@@ -22,7 +22,7 @@ public function query() {
     // Add the field.
     $params = $this->options['group_type'] !== 'group' ? ['function' => $this->options['group_type']] : [];
 
-    $formula = $this->query->getDateFormat("FROM_UNIXTIME($this->tableAlias.$this->realField)", 'D, d/m/Y');
+    $formula = $this->query->getDateFormat("FROM_UNIXTIME($this->tableAlias.$this->realField)", 'D, m/d/Y');
 
     $this->field_alias = $this->query->addField(NULL, $formula, "{$this->tableAlias}_{$this->realField}", $params);
     $this->query->addGroupBy($this->field_alias);

diff --git a/openy_gated_content.install b/openy_gated_content.install
@@ -347,8 +347,8 @@ function openy_gated_content_update_8018() {
   $entity_type->setClass(VyFavoriteItem::class);
   $definitions = VyFavoriteItem::baseFieldDefinitions($entity_type);
   foreach ($definitions as $name => $definition) {
-    if ($definition_manager->getFieldStorageDefinition($name, $entity_type_id)) {
-      $definition_manager->updateFieldStorageDefinition($definition);
+    if ($original = $definition_manager->getFieldStorageDefinition($name, $entity_type_id)) {
+      $definition_manager->updateFieldStorageDefinition($original);
     }
     else {
       $definition_manager->installFieldStorageDefinition($name, $entity_type_id, 'openy_gated_content', $definition);