Skip to content

Commit 6899b8c

Browse files
committed
renamed "melody-timeout" option to "melody_timeout"
for consistency with "ip_whitelist"
1 parent bb3c4ea commit 6899b8c

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

config.php.dist

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ return array(
1414
'bootstrap' => null,
1515

1616
// maximun execution time for melody scripts
17-
'melody-timeout' => 600,
17+
'melody_timeout' => 600,
1818
);

index.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
'bootstrap' => null,
1515

1616
// maximun execution time for melody scripts
17-
'melody-timeout' => 60,
17+
'melody_timeout' => 60,
1818
);
1919

2020
if (file_exists(__DIR__.'/config.php')) {
@@ -91,7 +91,7 @@ function runCode($__source_code, $__bootstrap_file)
9191
$start = microtime(true);
9292

9393
$melodyPlugin = new MelodyPlugin();
94-
$melodyPlugin->setTimeout($options['melody-timeout']);
94+
$melodyPlugin->setTimeout($options['melody_timeout']);
9595
if ($melodyPlugin->isMelodyScript($code)) {
9696
if ($melodyPlugin->isScriptingSupported()) {
9797
// make sure krumo class is available in the melody script

0 commit comments

Comments
 (0)