Skip to content

Commit

Permalink
Merge branch 'trunk' of https://github.com/ILIAS-eLearning/ILIAS into…
Browse files Browse the repository at this point in the history
… trunk
  • Loading branch information
matthiaskunkel committed Jun 14, 2022
2 parents 46b7f78 + 7dc5991 commit 68c1e42
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion CI/Rector/ChangeLicenseHeader.php
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ final class ChangeLicenseHeader extends AbstractRector
* https://github.com/ILIAS-eLearning
*
*********************************************************************/
";
";

private Comment $standard_comment;
private array $previous_search = [
Expand Down
2 changes: 1 addition & 1 deletion Services/COPage/classes/class.ilPageObject.php
Original file line number Diff line number Diff line change
Expand Up @@ -3039,7 +3039,7 @@ public function deleteContents(
// @todo 1: hook
// do not delete question nodes in assessment pages
if (!$this->checkForTag("Question", $a_hid[0], (string) $a_hid[1]) || $a_self_ass) {
$curr_node = $this->getContentNode($a_hid[0], $a_hid[1]);
$curr_node = $this->getContentNode((string) $a_hid[0], (string) $a_hid[1]);
if (is_object($curr_node)) {
$parent_node = $curr_node->parent_node();
if ($parent_node->node_name() != "TableRow") {
Expand Down

0 comments on commit 68c1e42

Please sign in to comment.