Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #2159911 by InternetDevels, ParisLiakos: drupal_load() is called pointlessly.

8.0.x
Nathaniel Catchpole 2014-01-31 11:52:42 +00:00
parent 60fb1aab99
commit 87bff520d0
3 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/modules/forum/forum.install
View File

@ -104,16 +104,10 @@ function forum_module_preinstall($module) {
* Implements hook_uninstall(). * Implements hook_uninstall().
*/ */
function forum_uninstall() { function forum_uninstall() {
// Load the dependent Taxonomy module, in case it has been disabled.
drupal_load('module', 'taxonomy');
if ($field = field_info_field('node', 'taxonomy_forums')) { if ($field = field_info_field('node', 'taxonomy_forums')) {
$field->delete(); $field->delete();
} }
// Load the dependent Comment module, in case it has been disabled.
drupal_load('module', 'comment');
if ($field = field_info_field('node', 'comment_forum')) { if ($field = field_info_field('node', 'comment_forum')) {
$field->delete(); $field->delete();
} }

1
core/modules/simpletest/simpletest.install
View File

@ -157,7 +157,6 @@ function simpletest_schema() {
* Implements hook_uninstall(). * Implements hook_uninstall().
*/ */
function simpletest_uninstall() { function simpletest_uninstall() {
drupal_load('module', 'simpletest');
simpletest_clean_database(); simpletest_clean_database();
// Remove generated files. // Remove generated files.

1
core/modules/system/lib/Drupal/system/Tests/File/ScanDirectoryTest.php
View File

@ -61,7 +61,6 @@ class ScanDirectoryTest extends FileTestBase {
* Check that the callback function is called correctly. * Check that the callback function is called correctly.
*/ */
function testOptionCallback() { function testOptionCallback() {
drupal_load('module', 'file_test');
// When nothing is matched nothing should be passed to the callback. // When nothing is matched nothing should be passed to the callback.
$all_files = file_scan_directory($this->path, '/^NONEXISTINGFILENAME/', array('callback' => 'file_test_file_scan_callback')); $all_files = file_scan_directory($this->path, '/^NONEXISTINGFILENAME/', array('callback' => 'file_test_file_scan_callback'));