Skip to content

Commit

Permalink
Restore SimpleSAMLphp 1.14 compatibility for 1.x branch
Browse files Browse the repository at this point in the history
This reverts commit 00da208.
This reverts commit 902f01c.
  • Loading branch information
tvdijen committed May 5, 2018
1 parent d160a92 commit 695c809
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion hooks/hook_frontpage.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ function monitor_hook_frontpage(&$links) {
assert(is_array($links));
assert(array_key_exists('links', $links));
$links['config'][] = array(
'href' => \SimpleSAML\Module::getModuleURL('monitor/monitor.php'),
'href' => SimpleSAML_Module::getModuleURL('monitor/monitor.php'),
'text' => array('en' => 'Monitor'),
);

Expand Down
4 changes: 2 additions & 2 deletions lib/TestSuite/Modules.php
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,9 @@ private function setRequiredModules() {
$this->addRequiredPhpModule($this->store_php_dependencies[$store]);
}

$modules = \SimpleSAML\Module::getModules();
$modules = \SimpleSAML_Module::getModules();
foreach ($modules as $module) {
if (\SimpleSAML\Module::isModuleEnabled($module)) {
if (\SimpleSAML_Module::isModuleEnabled($module)) {
if (array_key_exists($module, $this->module_apache_dependencies)) {
$dependencies = \SimpleSAML\Utils\Arrays::Arrayize($this->module_apache_dependencies[$module]);
foreach ($dependencies as $dependency) {
Expand Down

0 comments on commit 695c809

Please sign in to comment.