L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-83424 install: Fix install scripts

Browse Source
This commit is contained in:
Michael Aherne
2025-07-12 17:51:41 +08:00
committed by Andrew Nicols
parent 3133520615
commit 546de30fde
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/admin/cli/install.php
+2 -1
View File
@@ -103,7 +103,7 @@ if (file_exists($distrolibfile)) {
}
// Nothing to do if config.php exists
$configfile = __DIR__.'/../../config.php';
$configfile = dirname(__DIR__, 3).'/config.php';
if (file_exists($configfile)) {
require($configfile);
require_once($CFG->libdir.'/clilib.php');
@@ -158,6 +158,7 @@ global $CFG;
$CFG = new stdClass();
$CFG->lang = 'en';
$CFG->dirroot = dirname(dirname(__DIR__));
$CFG->root = dirname(__DIR__, 3);
$CFG->libdir = "$CFG->dirroot/lib";
$CFG->wwwroot = "http://localhost";
$CFG->httpswwwroot = $CFG->wwwroot;
install.php → public/install.php
+2 -1
View File
@@ -37,7 +37,7 @@ if (isset($_REQUEST['admin'])) {
}
// If config.php exists we just created config.php and need to redirect to continue installation
$configfile = '../config.php';
$configfile = dirname(__DIR__) . '/config.php';
if (file_exists($configfile)) {
header("Location: $admin/index.php?lang=$lang");
die;
@@ -163,6 +163,7 @@ global $CFG;
$CFG = new stdClass();
$CFG->lang = $config->lang;
$CFG->dirroot = __DIR__;
$CFG->root = dirname(__DIR__);
$CFG->libdir = "$CFG->dirroot/lib";
$CFG->wwwroot = install_guess_wwwroot(); // can not be changed - ppl must use the real address when installing
$CFG->httpswwwroot = $CFG->wwwroot;
public/message/output/popup/message_output_popup.php
+1 -1
View File
@@ -22,7 +22,7 @@
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v2 or later
*/
require_once(__DIR__ . '/../../../config.php'); //included from messagelib (how to fix?)
require_once(__DIR__ . '/../../../../config.php'); //included from messagelib (how to fix?)
require_once($CFG->dirroot.'/message/output/lib.php');
/**