mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-17 21:49:15 +01:00
Code Issues Projects Releases Wiki Activity

MDL-46267 core: Remove $CFG->httpswwwroot

Browse Source 
* It's unnecessary since $CFG->loginhttps has already been removed and
  it's no longer being used in core anymore.
This commit is contained in:
Jun Pataleta 2019-07-22 10:49:42 +08:00
parent b6e465c870
commit 9320787005
9 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
admin/cli/install.php
View File

@ -157,7 +157,6 @@ $CFG->lang = 'en';
$CFG->dirroot = dirname(dirname(__DIR__));
$CFG->libdir = "$CFG->dirroot/lib";
$CFG->wwwroot = "http://localhost";
$CFG->httpswwwroot = $CFG->wwwroot;
$CFG->docroot = 'http://docs.moodle.org';
$CFG->running_installer = true;
$CFG->early_install_lang = true;
@ -389,8 +388,6 @@ if ($interactive) {
}
}
$CFG->wwwroot = $wwwroot;
$CFG->httpswwwroot = $CFG->wwwroot;
//We need dataroot before lang download
$CFG->dataroot = $options['dataroot'];

2
admin/tool/mobile/tests/externallib_test.php
View File

@ -71,7 +71,7 @@ class tool_mobile_external_testcase extends externallib_advanced_testcase {
$expected = array(
'wwwroot' => $CFG->wwwroot,
'httpswwwroot' => $CFG->httpswwwroot,
'httpswwwroot' => $CFG->wwwroot,
'sitename' => external_format_string($SITE->fullname, $context->id, true),
'guestlogin' => $CFG->guestloginbutton,
'rememberusername' => $CFG->rememberusername,

1
install.php
View File

@ -160,7 +160,6 @@ $CFG->lang = $config->lang;
$CFG->dirroot = __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;
$CFG->dataroot = $config->dataroot;
$CFG->tempdir = $CFG->dataroot.'/temp';
$CFG->backuptempdir = $CFG->tempdir.'/backup';

6
lib/db/upgrade.php
View File

@ -3416,5 +3416,11 @@ function xmldb_main_upgrade($oldversion) {
upgrade_main_savepoint(true, 2019070400.01);
}
if ($oldversion < 2019072200.00) {
unset_config('httpswwwroot');
upgrade_main_savepoint(true, 2019072200.00);
}
return true;
}

3
lib/phpunit/tests/basic_test.php
View File

@ -52,9 +52,6 @@ class core_phpunit_basic_testcase extends basic_testcase {
*/
public function test_bootstrap() {
global $CFG;
// The use of httpswwwroot is deprecated, but we are still setting it for backwards compatibility.
$this->assertTrue(isset($CFG->httpswwwroot));
$this->assertEquals($CFG->httpswwwroot, $CFG->wwwroot);
$this->assertEquals($CFG->prefix, $CFG->phpunit_prefix);
}

4
lib/setup.php
View File

@ -534,10 +534,6 @@ global $FULLSCRIPT;
*/
global $SCRIPT;
// Set httpswwwroot to $CFG->wwwroot for backwards compatibility
// The loginhttps option is deprecated, so httpswwwroot is no longer necessary. See MDL-42834.
$CFG->httpswwwroot = $CFG->wwwroot;
require_once($CFG->libdir .'/setuplib.php'); // Functions that MUST be loaded first
if (NO_OUTPUT_BUFFERING) {

5
lib/tests/outputcomponents_test.php
View File

@ -245,7 +245,6 @@ class core_outputcomponents_testcase extends advanced_testcase {
// TODO MDL-44792 Rewrite those tests to use a fixture.
// Now test gravatar with one theme having own images (afterburner).
// $CFG->httpswwwroot = $CFG->wwwroot;
// $this->assertFileExists("$CFG->dirroot/theme/afterburner/config.php");
// set_config('theme', 'afterburner');
// $page = new moodle_page();
@ -256,9 +255,6 @@ class core_outputcomponents_testcase extends advanced_testcase {
// $up2 = new user_picture($user2);
// $this->assertEquals('http://www.gravatar.com/avatar/ab53a2911ddf9b4817ac01ddcd3d975f?s=35&d=http%3A%2F%2Fwww.example.com%2Fmoodle%2Ftheme%2Fafterburner%2Fpix_core%2Fu%2Ff2.png', $up2->get_url($page, $renderer)->out(false));
// // Https version.
// $CFG->httpswwwroot = str_replace('http:', 'https:', $CFG->wwwroot);
// $up2 = new user_picture($user2);
// $this->assertSame('https://secure.gravatar.com/avatar/ab53a2911ddf9b4817ac01ddcd3d975f?s=35&d=https%3A%2F%2Fwww.example.com%2Fmoodle%2Ftheme%2Fafterburner%2Fpix_core%2Fu%2Ff2.png', $up2->get_url($page, $renderer)->out(false));
// End of gravatar tests.
@ -267,7 +263,6 @@ class core_outputcomponents_testcase extends advanced_testcase {
// set_config('enablegravatar', 0);
// $this->assertFileExists("$CFG->dirroot/theme/formal_white/config.php"); // Use any other theme.
// set_config('theme', 'formal_white');
// $CFG->httpswwwroot = $CFG->wwwroot;
// $page = new moodle_page();
// $page->set_url('/user/profile.php');
// $page->set_context(context_system::instance());

2
lib/upgrade.txt
View File

@ -22,6 +22,8 @@ information provided here is intended especially for developers.
at least a single checkbox item is selected or not.
* Final deprecation (removal) of the core/modal_confirm dialogue.
* Upgrade scssphp to v1.0.2, This involves renaming classes from Leafo => ScssPhp as the repo has changed.
* $CFG->httpswwwroot has been removed. It is no longer necessary as loginhttps has already been removed and it's no longer being
used anywhere in core.
=== 3.7 ===

2
version.php
View File

@ -29,7 +29,7 @@
defined('MOODLE_INTERNAL') || die();
$version = 2019071800.00; // YYYYMMDD = weekly release date of this DEV branch.
$version = 2019072200.00; // YYYYMMDD = weekly release date of this DEV branch.
// RR = release increments - 00 in DEV branches.
// .XX = incremental changes.