Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New release version v1.7.5 #922

Merged
merged 9 commits into from
Feb 19, 2024
Merged

New release version v1.7.5 #922

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8532100
HPC-9325: Temporarily works around an issue originally caused by dupl…
berliner Feb 14, 2024
9340953
HPC-9325: Remove obsolete config file
berliner Feb 14, 2024
b26ba58
HPC-9325: Replace deprecated function drupal_rewrite_settings
berliner Feb 14, 2024
207d85a
Merge pull request #919 from UN-OCHA/berliner/HPC-9325
berliner Feb 14, 2024
344eef6
chore: Update all outdated drupal/* packages.
unocha-jenkins Feb 15, 2024
b894089
Fix text color of active menu item in toolbar menu
berliner Feb 16, 2024
250bb31
Merge pull request #921 from UN-OCHA/berliner/gin-regression
berliner Feb 17, 2024
35e148f
Fix tests
berliner Feb 17, 2024
76fe18d
Merge pull request #920 from UN-OCHA/update/patch-207d85a
berliner Feb 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 28 additions & 28 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 0 additions & 18 deletions config/ghi_blocks.global_year_settings.yml
View file
Open in desktop

This file was deleted.

4 changes: 3 additions & 1 deletion html/modules/custom/ghi_blocks/src/Traits/HomepageBlockTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,9 @@ protected function getHomepages() {
$years = array_map(function ($node) {
return $node->get('field_year')->value;
}, $nodes);
return array_combine($years, $nodes);
$nodes = array_combine($years, $nodes);
krsort($nodes);
return $nodes;
}

/**
Expand Down
2 changes: 1 addition & 1 deletion ...hi_embargoed_access/src/Plugin/Field/FieldFormatter/EntityAccessPasswordFormFormatter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

declare(strict_types = 1);
declare(strict_types=1);

namespace Drupal\ghi_embargoed_access\Plugin\Field\FieldFormatter;

Expand Down
2 changes: 1 addition & 1 deletion html/modules/custom/ghi_gin/css/gin_toolbar.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
}
.gin--horizontal-toolbar #toolbar-item-administration-tray > nav > div > .toolbar-menu > li > a.toolbar-icon,
.gin--horizontal-toolbar #toolbar-item-administration-tray > nav > div > .toolbar-menu > li > .toolbar-box > a.toolbar-icon {
color: white;
color: white !important;
}
.gin--horizontal-toolbar #toolbar-item-administration-tray > nav > div > .toolbar-menu > li > a.toolbar-icon::before,
.gin--horizontal-toolbar #toolbar-item-administration-tray > nav > div > .toolbar-menu > li > .toolbar-box > a.toolbar-icon::before {
Expand Down
6 changes: 5 additions & 1 deletion scripts/composer/ScriptHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
use Composer\Script\Event;
use Composer\Semver\Comparator;
use Drupal\Core\Site\Settings;
use Drupal\Core\Site\SettingsEditor;
use DrupalFinder\DrupalFinder;
use Symfony\Component\Filesystem\Filesystem;
use Symfony\Component\Filesystem\Exception\IOException;
Expand Down Expand Up @@ -49,7 +50,10 @@ public static function createRequiredFiles(Event $event) {
'required' => TRUE,
],
];
drupal_rewrite_settings($settings, $drupalRoot . '/sites/default/settings.php');
SettingsEditor::rewrite(
$drupalRoot . '/sites/default/settings.php',
$settings
);
$fs->chmod($drupalRoot . '/sites/default/settings.php', 0666);
$event->getIO()->write("Create a sites/default/settings.php file with chmod 0666");

Expand Down
Loading