Skip to content
Snippets Groups Projects
Commit eabd634b authored by Michaela Brückner's avatar Michaela Brückner :unicorn:
Browse files

Merge remote-tracking branch 'origin/main' into main

parents 7985a9b4 3b5a8591
No related branches found
No related tags found
No related merge requests found
...@@ -27,7 +27,7 @@ class ProfileController extends AuthenticatedController ...@@ -27,7 +27,7 @@ class ProfileController extends AuthenticatedController
Navigation::activateItem('/profile/index'); Navigation::activateItem('/profile/index');
URLHelper::addLinkParam('username', Request::username('username')); URLHelper::addLinkParam('username', Request::username('username'));
PageLayout::setHelpKeyword('Basis.Homepage'); PageLayout::setHelpKeyword('Basis.Homepage');
SkipLinks::addIndex(_('Benutzerprofil'), 'user_profile', 100); SkipLinks::addIndex(_('Benutzerprofil'), 'layout_content', 100);
$this->user = User::findCurrent(); // current logged in user $this->user = User::findCurrent(); // current logged in user
$this->perm = $GLOBALS['perm']; // perms of current logged in user $this->perm = $GLOBALS['perm']; // perms of current logged in user
......
...@@ -152,7 +152,7 @@ class CoursewareIntegration extends \Migration ...@@ -152,7 +152,7 @@ class CoursewareIntegration extends \Migration
':description' => 'Mit dieser Konfigurationseinstellung wird für eine Courseware festgelegt, welche Rechtestufe Inhalte editieren dürfen.', ':description' => 'Mit dieser Konfigurationseinstellung wird für eine Courseware festgelegt, welche Rechtestufe Inhalte editieren dürfen.',
':range' => 'range', ':range' => 'range',
':type' => 'string', ':type' => 'string',
':value' => 'dozent' ':value' => 'tutor'
]); ]);
$statement->execute([ $statement->execute([
':name' => 'COURSEWARE_LAST_ELEMENT', ':name' => 'COURSEWARE_LAST_ELEMENT',
......
<?php <?php
final class FixMyCoursesGroupConfig extends Migration final class FixMyCoursesGroupConfig extends Migration
{ {
public function description()
{
return 'Ensures correct format of MY_COURSES_OPEN_GROUPS user config option';
}
public function up() public function up()
{ {
ConfigValue::findEachBySQL( ConfigValue::findEachBySQL(
......
...@@ -404,9 +404,9 @@ function object_id_to_type($id) ...@@ -404,9 +404,9 @@ function object_id_to_type($id)
]; ];
if (!in_array($id, [0, -1, -2])) { if (!in_array($id, [0, -1, -2])) {
$plugin = PluginManager::getInstance()->getPluginById($id); $plugin = PluginManager::getInstance()->getPluginInfoById($id);
if ($plugin) { if ($plugin) {
$search = get_class($plugin); $search = $plugin['class'];
} }
} else { } else {
$search = (int)$id; $search = (int)$id;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment