Skip to content

Commit

Permalink
Avoid "strange" characters
Browse files Browse the repository at this point in the history
  • Loading branch information
mlocati committed Nov 22, 2023
1 parent 00cefc1 commit 533ce13
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion concrete/blocks/calendar_event/controller.php
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ public function getOccurrence()
/** @phpstan-ignore-next-line */
if ($occurrence->getEvent() && Event::isRelatedTo($occurrence->getEvent(), $event)) {
// this is a temporary hack. We need to ultimately make this make sure that
// the event matches but sometimes our events don't match because we imported them as series
// the event matches -but sometimes our events don't match because we imported them as series
// events and not as occurrences of one event.
// @TODO delete this code when we no longer need it and all related events are migrated into multidate events.
/** @phpstan-ignore-next-line */
Expand Down
2 changes: 1 addition & 1 deletion concrete/bootstrap/configure.php
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
/*
* ----------------------------------------------------------------------------
* ## If we're still here, we're proceeding through this concrete directory,
* and it's time to load the rest of our hard-coded configuration options 
* and it's time to load the rest of our hard-coded configuration options
* the one we don't need a database to tell us about.
*
* Namespacing and Autoloading
Expand Down
2 changes: 1 addition & 1 deletion concrete/controllers/panel/add.php
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ private function getOrphanedBlockIds($usedAreas)
foreach ($queryBuilder->execute()->fetchAll() as $row) {
/*
* Use the block id as key to prevent duplicates because of the second join statement. The "group by"
* statement results in sql_mode=only_full_group_by MySQL-issue and all other solutions like executing
* statement results in sql_mode=only_full_group_by MySQL-issue and all other solutions like executing
* sub-queries to get the area name are having a bad performance.
*/
$orphanedBlockIds[$row["bID"]] = $row;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
$('a.dialog-launch').dialog();

// pop open the latest control so we can edit its options immediately
$('div[data-field-set=<?php echo $set->getID()?>] tr[data-field-set-control]:last-child a[data-command=edit-control]').trigger('click');
$('div[data-field-set=<?php echo $set->getID()?>] tr[data-field-set-control]:last-child a[data-command=edit-control]').trigger('click');

}
});
Expand Down
2 changes: 1 addition & 1 deletion concrete/src/Attribute/ObjectTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ public function setAttribute($ak, $value, $doReindexImmediately = true)
if ($value instanceof EmptyRequestAttributeValue) {
// LEGACY SUPPORT
// If the passed $value object == EmptyRequestAttributeValue, we know we are dealing
// with a legacy attribute type that's not using Doctrine. We have not returned an
// with a legacy attribute type that's not using Doctrine. We have not returned an
// attribute value value object.
$controller->saveForm($controller->post());
$value = false;
Expand Down
2 changes: 1 addition & 1 deletion concrete/src/Entity/Block/BlockType/BlockType.php
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ public function isCopiedWhenPropagated()
}

/**
* If true, this block is not versioned on a page – it is included as is on all versions of the page, even when updated.
* If true, this block is not versioned on a page – it is included as is on all versions of the page, even when updated.
*
* @return bool
*/
Expand Down

0 comments on commit 533ce13

Please sign in to comment.