>
-
-
-
-
-
-
<?php print $head_title; ?>
diff --git a/core/modules/system/page.tpl.php b/core/modules/system/page.tpl.php
index 5c53d2b..f77fdad 100644
--- a/core/modules/system/page.tpl.php
+++ b/core/modules/system/page.tpl.php
@@ -50,7 +50,7 @@
* - $action_links (array): Actions local to the page, such as 'Add menu' on the
* menu administration interface.
* - $feed_icons: A string of all feed icons for the current page.
- * - $node: The node entity, if there is an automatically-loaded node
+ * - $node: The node object, if there is an automatically-loaded node
* associated with the page, and the node ID is the second argument
* in the page's path (e.g. node/12345 and node/12345/revisions, but not
* comment/reply/12345).
diff --git a/core/modules/system/system.admin.inc b/core/modules/system/system.admin.inc
index aac0c3d..3bd3b89 100644
--- a/core/modules/system/system.admin.inc
+++ b/core/modules/system/system.admin.inc
@@ -5,6 +5,8 @@
* Admin page callbacks for the system module.
*/
+use Symfony\Component\HttpFoundation\Response;
+
/**
* Menu callback; Provide the administration overview page.
*/
@@ -1494,7 +1496,7 @@ function system_site_information_settings() {
'#default_value' => (variable_get('site_frontpage') != 'user' ? drupal_get_path_alias(variable_get('site_frontpage', 'user')) : ''),
'#size' => 40,
'#description' => t('Optionally, specify a relative URL to display as the front page. Leave blank to display the default content feed.'),
- '#field_prefix' => url(NULL, array('absolute' => TRUE)) . (variable_get('clean_url', 0) ? '' : '?q='),
+ '#field_prefix' => url(NULL, array('absolute' => TRUE)),
);
$form['front_page']['default_nodes_main'] = array(
'#type' => 'select', '#title' => t('Number of posts on front page'),
@@ -1513,7 +1515,7 @@ function system_site_information_settings() {
'#default_value' => variable_get('site_403', ''),
'#size' => 40,
'#description' => t('This page is displayed when the requested document is denied to the current user. Leave blank to display a generic "access denied" page.'),
- '#field_prefix' => url(NULL, array('absolute' => TRUE)) . (variable_get('clean_url', 0) ? '' : '?q=')
+ '#field_prefix' => url(NULL, array('absolute' => TRUE)),
);
$form['error_page']['site_404'] = array(
'#type' => 'textfield',
@@ -1521,7 +1523,7 @@ function system_site_information_settings() {
'#default_value' => variable_get('site_404', ''),
'#size' => 40,
'#description' => t('This page is displayed when no other content matches the requested document. Leave blank to display a generic "page not found" page.'),
- '#field_prefix' => url(NULL, array('absolute' => TRUE)) . (variable_get('clean_url', 0) ? '' : '?q=')
+ '#field_prefix' => url(NULL, array('absolute' => TRUE)),
);
$form['#validate'][] = 'system_site_information_settings_validate';
@@ -2206,96 +2208,6 @@ function system_site_maintenance_mode() {
}
/**
- * Form builder; Configure clean URL settings.
- *
- * @ingroup forms
- * @see system_settings_form()
- */
-function system_clean_url_settings($form, &$form_state) {
- $available = FALSE;
- $conflict = FALSE;
-
- // If the request URI is a clean URL, clean URLs must be available.
- // Otherwise, run a test.
- if (strpos(request_uri(), '?q=') === FALSE && strpos(request_uri(), '&q=') === FALSE) {
- $available = TRUE;
- }
- else {
- $request = drupal_http_request($GLOBALS['base_url'] . '/admin/config/search/clean-urls/check');
- // If the request returns HTTP 200, clean URLs are available.
- if (isset($request->code) && $request->code == 200) {
- $available = TRUE;
- // If the user started the clean URL test, provide explicit feedback.
- if (isset($form_state['input']['clean_url_test_execute'])) {
- drupal_set_message(t('The clean URL test passed.'));
- }
- }
- else {
- // If the test failed while clean URLs are enabled, make sure clean URLs
- // can be disabled.
- if (variable_get('clean_url', 0)) {
- $conflict = TRUE;
- // Warn the user of a conflicting situation, unless after processing
- // a submitted form.
- if (!isset($form_state['input']['op'])) {
- drupal_set_message(t('Clean URLs are enabled, but the clean URL test failed. Uncheck the box below to disable clean URLs.'), 'warning');
- }
- }
- // If the user started the clean URL test, provide explicit feedback.
- elseif (isset($form_state['input']['clean_url_test_execute'])) {
- drupal_set_message(t('The clean URL test failed.'), 'warning');
- }
- }
- }
-
- // Show the enable/disable form if clean URLs are available or if the user
- // must be able to resolve a conflicting setting.
- if ($available || $conflict) {
- $form['clean_url'] = array(
- '#type' => 'checkbox',
- '#title' => t('Enable clean URLs'),
- '#default_value' => variable_get('clean_url', 0),
- '#description' => t('Use URLs like example.com/user instead of example.com/?q=user.'),
- );
- $form = system_settings_form($form);
- if ($conflict) {
- // $form_state['redirect'] needs to be set to the non-clean URL,
- // otherwise the setting is not saved.
- $form_state['redirect'] = url('', array('query' => array('q' => '/admin/config/search/clean-urls')));
- }
- }
- // Show the clean URLs test form.
- else {
- drupal_add_js(drupal_get_path('module', 'system') . '/system.js');
-
- $form_state['redirect'] = url('admin/config/search/clean-urls');
- $form['clean_url_description'] = array(
- '#type' => 'markup',
- '#markup' => '' . t('Use URLs like example.com/user instead of example.com/?q=user.'),
- );
- // Explain why the user is seeing this page and what to expect after
- // clicking the 'Run the clean URL test' button.
- $form['clean_url_test_result'] = array(
- '#type' => 'markup',
- '#markup' => '
' . t('Clean URLs cannot be enabled. If you are directed to this page or to a Page not found (404) error after testing for clean URLs, see the online handbook.', array('@handbook' => 'http://drupal.org/node/15365')) . '
',
- );
- $form['actions'] = array(
- '#type' => 'actions',
- 'clean_url_test' => array(
- '#type' => 'submit',
- '#value' => t('Run the clean URL test'),
- ),
- );
- $form['clean_url_test_execute'] = array(
- '#type' => 'hidden',
- '#value' => 1,
- );
- }
-
- return $form;
-}
-
-/**
* Menu callback: displays the site status report. Can also be used as a pure check.
*
* @param $check
@@ -2357,6 +2269,9 @@ function system_batch_page() {
if ($output === FALSE) {
drupal_access_denied();
}
+ elseif ($output instanceof Response) {
+ return $output;
+ }
elseif (isset($output)) {
// Force a page without blocks or messages to
// display a list of collected messages later.
diff --git a/core/modules/system/system.api.php b/core/modules/system/system.api.php
index c6e1288..7c9c49b 100644
--- a/core/modules/system/system.api.php
+++ b/core/modules/system/system.api.php
@@ -497,7 +497,7 @@ function hook_page_build(&$page) {
*/
function hook_menu_get_item_alter(&$router_item, $path, $original_map) {
// When retrieving the router item for the current path...
- if ($path == $_GET['q']) {
+ if ($path == current_path()) {
// ...call a function that prepares something for this request.
mymodule_prepare_something();
}
@@ -1153,7 +1153,7 @@ function hook_menu_contextual_links_alter(&$links, $router_item, $root_path) {
* $page['content']['system_main']['nodes'][$nid]['body']
* // Array of links attached to the node (add comments, read more).
* $page['content']['system_main']['nodes'][$nid]['links']
- * // The node entity itself.
+ * // The node object itself.
* $page['content']['system_main']['nodes'][$nid]['#node']
* // The results pager.
* $page['content']['system_main']['pager']
@@ -1183,7 +1183,7 @@ function hook_page_alter(&$page) {
* Perform alterations before a form is rendered.
*
* One popular use of this hook is to add form elements to the node form. When
- * altering a node form, the node entity can be accessed at $form['#node'].
+ * altering a node form, the node object can be accessed at $form['#node'].
*
* In addition to hook_form_alter(), which is called for all forms, there are
* two more specific form hooks available. The first,
@@ -1934,40 +1934,31 @@ function hook_xmlrpc_alter(&$methods) {
}
/**
- * Log an event message.
+ * Log an event message
*
* This hook allows modules to route log events to custom destinations, such as
* SMS, Email, pager, syslog, ...etc.
*
- * @param array $log_entry
+ * @param $log_entry
* An associative array containing the following keys:
- * - type: The type of message for this entry.
- * - user: The user object for the user who was logged in when the event
- * happened.
- * - request_uri: The request URI for the page the event happened in.
- * - referer: The page that referred the user to the page where the event
- * occurred.
+ * - type: The type of message for this entry. For contributed modules, this is
+ * normally the module name. Do not use 'debug', use severity WATCHDOG_DEBUG instead.
+ * - user: The user object for the user who was logged in when the event happened.
+ * - request_uri: The Request URI for the page the event happened in.
+ * - referer: The page that referred the use to the page where the event occurred.
* - ip: The IP address where the request for the page came from.
- * - timestamp: The UNIX timestamp of the date/time the event occurred.
- * - severity: The severity of the message; one of the following values as
- * defined in @link http://www.faqs.org/rfcs/rfc3164.html RFC 3164: @endlink
- * - WATCHDOG_EMERGENCY: Emergency, system is unusable.
- * - WATCHDOG_ALERT: Alert, action must be taken immediately.
- * - WATCHDOG_CRITICAL: Critical conditions.
- * - WATCHDOG_ERROR: Error conditions.
- * - WATCHDOG_WARNING: Warning conditions.
- * - WATCHDOG_NOTICE: Normal but significant conditions.
- * - WATCHDOG_INFO: Informational messages.
- * - WATCHDOG_DEBUG: Debug-level messages.
- * - link: An optional link provided by the module that called the watchdog()
- * function.
- * - message: The text of the message to be logged. Variables in the message
- * are indicated by using placeholder strings alongside the variables
- * argument to declare the value of the placeholders. See t() for
- * documentation on how the message and variable parameters interact.
- * - variables: An array of variables to be inserted into the message on
- * display. Will be NULL or missing if a message is already translated or if
- * the message is not possible to translate.
+ * - timestamp: The UNIX timestamp of the date/time the event occurred
+ * - severity: One of the following values as defined in RFC 3164 http://www.faqs.org/rfcs/rfc3164.html
+ * WATCHDOG_EMERGENCY Emergency: system is unusable
+ * WATCHDOG_ALERT Alert: action must be taken immediately
+ * WATCHDOG_CRITICAL Critical: critical conditions
+ * WATCHDOG_ERROR Error: error conditions
+ * WATCHDOG_WARNING Warning: warning conditions
+ * WATCHDOG_NOTICE Notice: normal but significant condition
+ * WATCHDOG_INFO Informational: informational messages
+ * WATCHDOG_DEBUG Debug: debug-level messages
+ * - link: an optional link provided by the module that called the watchdog() function.
+ * - message: The text of the message to be logged.
*/
function hook_watchdog(array $log_entry) {
global $base_url, $language_interface;
diff --git a/core/modules/system/system.cron.js b/core/modules/system/system.cron.js
index af17dab..aa5b351 100644
--- a/core/modules/system/system.cron.js
+++ b/core/modules/system/system.cron.js
@@ -9,7 +9,7 @@ Drupal.behaviors.cronCheck = {
$('body').once('cron-check', function() {
// Only execute the cron check if its the right time.
if (Math.round(new Date().getTime() / 1000.0) > settings.cronCheck) {
- $.get(settings.basePath + 'system/run-cron-check');
+ $.get(Drupal.url('system/run-cron-check'));
}
});
}
diff --git a/core/modules/system/system.install b/core/modules/system/system.install
index 51603ff..acd0e2d 100644
--- a/core/modules/system/system.install
+++ b/core/modules/system/system.install
@@ -862,7 +862,6 @@ function system_schema() {
'length' => 255,
'not null' => TRUE,
'default' => '',
- 'binary' => TRUE,
),
'uri' => array(
'description' => 'The URI to access the file (either local or remote).',
@@ -870,7 +869,6 @@ function system_schema() {
'length' => 255,
'not null' => TRUE,
'default' => '',
- 'binary' => TRUE,
),
'langcode' => array(
'description' => 'The {language}.langcode of this file.',
@@ -1849,6 +1847,13 @@ function system_update_8007() {
}
/**
+ * Remove the 'clean_url' configuration variable.
+ */
+function system_update_8008() {
+ variable_del('clean_url');
+}
+
+/**
* @} End of "defgroup updates-7.x-to-8.x"
* The next series of updates should start at 9000.
*/
diff --git a/core/modules/system/system.js b/core/modules/system/system.js
index 98da1a6..ab00426 100644
--- a/core/modules/system/system.js
+++ b/core/modules/system/system.js
@@ -20,55 +20,6 @@ Drupal.hideEmailAdministratorCheckbox = function () {
};
/**
- * Internal function to check using Ajax if clean URLs can be enabled on the
- * settings page.
- *
- * This function is not used to verify whether or not clean URLs
- * are currently enabled.
- */
-Drupal.behaviors.cleanURLsSettingsCheck = {
- attach: function (context, settings) {
- // This behavior attaches by ID, so is only valid once on a page.
- // Also skip if we are on an install page, as Drupal.cleanURLsInstallCheck will handle
- // the processing.
- if (!($('#edit-clean-url').length) || $('#edit-clean-url.install').once('clean-url').length) {
- return;
- }
- var url = settings.basePath + 'admin/config/search/clean-urls/check';
- $.ajax({
- url: location.protocol + '//' + location.host + url,
- dataType: 'json',
- success: function () {
- // Check was successful. Redirect using a "clean URL". This will force the form that allows enabling clean URLs.
- location = settings.basePath +"admin/config/search/clean-urls";
- }
- });
- }
-};
-
-/**
- * Internal function to check using Ajax if clean URLs can be enabled on the
- * install page.
- *
- * This function is not used to verify whether or not clean URLs
- * are currently enabled.
- */
-Drupal.cleanURLsInstallCheck = function () {
- var url = location.protocol + '//' + location.host + Drupal.settings.basePath + 'admin/config/search/clean-urls/check';
- // Submit a synchronous request to avoid database errors associated with
- // concurrent requests during install.
- $.ajax({
- async: false,
- url: url,
- dataType: 'json',
- success: function () {
- // Check was successful.
- $('#edit-clean-url').attr('value', 1);
- }
- });
-};
-
-/**
* When a field is filled out, apply its value to other fields that will likely
* use the same value. In the installer this is used to populate the
* administrator e-mail address with the same value as the site e-mail address.
diff --git a/core/modules/system/system.maintenance.css b/core/modules/system/system.maintenance.css
index 5543c2d..16a2f35 100644
--- a/core/modules/system/system.maintenance.css
+++ b/core/modules/system/system.maintenance.css
@@ -1,4 +1,3 @@
-
/**
* Update styles
*/
@@ -46,10 +45,3 @@
ol.task-list li.active {
font-weight: bold;
}
-
-/**
- * Installation clean URLs
- */
-#clean-url.install {
- display: none;
-}
diff --git a/core/modules/system/system.module b/core/modules/system/system.module
index dfb8936..4650469 100644
--- a/core/modules/system/system.module
+++ b/core/modules/system/system.module
@@ -88,7 +88,7 @@ function system_help($path, $arg) {
$output .= '' . t('Performing system maintenance') . '';
$output .= '' . t('In order for the site and its modules to continue to operate well, a set of routine administrative operations must run on a regular basis. The System module manages this task by making use of a system cron job. You can verify the status of cron tasks by visiting the Status report page. For more information, see the online handbook entry for configuring cron jobs. You can set up cron job by visiting Cron configuration page', array('@status' => url('admin/reports/status'), '@handbook' => 'http://drupal.org/cron', '@cron' => url('admin/config/system/cron'))) . '';
$output .= '' . t('Configuring basic site settings') . '';
- $output .= '' . t('The System module also handles basic configuration options for your site, including Date and time settings, File system settings, Clean URL support, Site name and other information, and a Maintenance mode for taking your site temporarily offline.', array('@date-time-settings' => url('admin/config/regional/date-time'), '@file-system' => url('admin/config/media/file-system'), '@clean-url' => url('admin/config/search/clean-urls'), '@site-info' => url('admin/config/system/site-information'), '@maintenance-mode' => url('admin/config/development/maintenance'))) . '';
+ $output .= '' . t('The System module also handles basic configuration options for your site, including Date and time settings, File system settings, Site name and other information, and a Maintenance mode for taking your site temporarily offline.', array('@date-time-settings' => url('admin/config/regional/date-time'), '@file-system' => url('admin/config/media/file-system'), '@site-info' => url('admin/config/system/site-information'), '@maintenance-mode' => url('admin/config/development/maintenance'))) . '';
$output .= '' . t('Configuring actions') . '';
$output .= '' . t('Actions are individual tasks that the system can do, such as unpublishing a piece of content or banning a user. Other modules can fire these actions when certain system events happen; for example, when a new post is added or when a user logs in. Modules may also provide additional actions. Visit the Actions page to configure actions.', array('@actions' => url('admin/config/system/actions'))) . '';
$output .= '';
@@ -971,23 +971,6 @@ function system_menu() {
'access arguments' => array('access administration pages'),
'file' => 'system.admin.inc',
);
- $items['admin/config/search/clean-urls'] = array(
- 'title' => 'Clean URLs',
- 'description' => 'Enable or disable clean URLs for your site.',
- 'page callback' => 'drupal_get_form',
- 'page arguments' => array('system_clean_url_settings'),
- 'access arguments' => array('administer site configuration'),
- 'file' => 'system.admin.inc',
- 'weight' => 5,
- );
- $items['admin/config/search/clean-urls/check'] = array(
- 'title' => 'Clean URL check',
- 'page callback' => 'drupal_json_output',
- 'page arguments' => array(array('status' => TRUE)),
- 'access callback' => TRUE,
- 'type' => MENU_CALLBACK,
- 'file' => 'system.admin.inc',
- );
// System settings.
$items['admin/config/system'] = array(
@@ -1850,8 +1833,7 @@ function system_authorized_get_url(array $options = array()) {
global $base_url;
// Force https if available, regardless of what the caller specifies.
$options['https'] = TRUE;
- // We prefix with $base_url so we get a full path even if clean URLs are
- // disabled.
+ // Prefix with $base_url so url() treats it as an external link.
return url($base_url . '/core/authorize.php', $options);
}
@@ -1995,8 +1977,11 @@ function system_add_module_assets() {
* Implements hook_custom_theme().
*/
function system_custom_theme() {
- if (user_access('view the administration theme') && path_is_admin(current_path())) {
- return variable_get('admin_theme');
+ if ($request = request()) {
+ $path = ltrim($request->getPathInfo(), '/');
+ if (user_access('view the administration theme') && path_is_admin($path)) {
+ return variable_get('admin_theme');
+ }
}
}
@@ -2021,14 +2006,15 @@ function system_form_user_register_form_alter(&$form, &$form_state) {
}
/**
- * Implements hook_user_presave().
+ * Implements hook_user_insert().
*/
-function system_user_presave($account) {
+function system_user_presave(&$edit, $account) {
if (variable_get('configurable_timezones', 1) && empty($account->timezone) && !variable_get('user_default_timezone', DRUPAL_USER_TIMEZONE_DEFAULT)) {
$account->timezone = variable_get('date_default_timezone', '');
}
}
+
/**
* Implements hook_user_login().
*/
@@ -3212,7 +3198,7 @@ function system_send_email_action_submit($form, $form_state) {
* Sends an e-mail message.
*
* @param object $entity
- * An optional node entity, which will be added as $context['node'] if
+ * An optional node object, which will be added as $context['node'] if
* provided.
* @param array $context
* Array with the following elements:
@@ -3286,7 +3272,7 @@ function system_message_action_submit($form, $form_state) {
* Sends a message to the current user's screen.
*
* @param object $entity
- * An optional node entity, which will be added as $context['node'] if
+ * An optional node object, which will be added as $context['node'] if
* provided.
* @param array $context
* Array with the following elements:
@@ -3920,15 +3906,17 @@ function system_date_format_save($date_format, $dfid = 0) {
drupal_write_record('date_formats', $info, $keys);
}
- $languages = language_list();
+ // Retrieve an array of language objects for enabled languages.
+ $languages = language_list(TRUE);
$locale_format = array();
$locale_format['type'] = $date_format['type'];
$locale_format['format'] = $date_format['format'];
- // Check if the suggested language codes are configured.
+ // Check if the suggested language codes are configured and enabled.
if (!empty($date_format['locales'])) {
foreach ($date_format['locales'] as $langcode) {
+ // Only proceed if language is enabled.
if (isset($languages[$langcode])) {
$is_existing = (bool) db_query_range('SELECT 1 FROM {date_format_locale} WHERE type = :type AND language = :language', 0, 1, array(':type' => $date_format['type'], ':language' => $langcode))->fetchField();
if (!$is_existing) {
diff --git a/core/modules/system/system.test b/core/modules/system/system.test
index 16348cc..5f4594a 100644
--- a/core/modules/system/system.test
+++ b/core/modules/system/system.test
@@ -946,47 +946,6 @@ class AdminMetaTagTestCase extends DrupalWebTestCase {
}
}
-class DefaultMobileMetaTagsTestCase extends DrupalWebTestCase {
- public static function getInfo() {
- return array(
- 'name' => 'Default mobile meta tags',
- 'description' => 'Confirm that the default mobile meta tags appear as expected.',
- 'group' => 'System'
- );
- }
-
- function setUp() {
- parent::setUp();
- $this->default_metatags = array(
- 'MobileOptimized' => '',
- 'HandheldFriendly' => '',
- 'viewport' => '',
- 'cleartype' => ''
- );
- }
-
- /**
- * Verifies that the default mobile meta tags are added.
- */
- public function testDefaultMetaTagsExist() {
- $this->drupalGet('');
- foreach ($this->default_metatags as $name => $metatag) {
- $this->assertRaw($metatag, 'Default Mobile meta tag "' . $name . '" displayed properly.', t('System'));
- }
- }
-
- /**
- * Verifies that the default mobile meta tags can be removed.
- */
- public function testRemovingDefaultMetaTags() {
- module_enable(array('system_module_test'));
- $this->drupalGet('');
- foreach ($this->default_metatags as $name => $metatag) {
- $this->assertNoRaw($metatag, 'Default Mobile meta tag "' . $name . '" removed properly.', t('System'));
- }
- }
-}
-
/**
* Tests custom access denied functionality.
*/
@@ -2900,6 +2859,6 @@ class SystemIndexPhpTest extends DrupalWebTestCase {
$this->assertResponse(200, t('Make sure index.php?q=user returns a valid page.'));
$this->drupalGet($index_php .'/user', array('external' => TRUE));
- $this->assertResponse(404, t("Make sure index.php/user returns a 'page not found'."));
+ $this->assertResponse(200, t("Make sure index.php/user returns a valid page."));
}
}
diff --git a/core/modules/system/tests/ajax.test b/core/modules/system/tests/ajax.test
index 4f254f8..49f1632 100644
--- a/core/modules/system/tests/ajax.test
+++ b/core/modules/system/tests/ajax.test
@@ -80,7 +80,7 @@ class AJAXFrameworkTestCase extends AJAXTestCase {
// drupal_add_js().
$expected = array(
'command' => 'settings',
- 'settings' => array('basePath' => base_path(), 'ajax' => 'test'),
+ 'settings' => array('ajax' => 'test'),
);
$this->assertCommand($commands, $expected, t('ajax_render() loads settings added with drupal_add_js().'));
diff --git a/core/modules/system/tests/common.test b/core/modules/system/tests/common.test
index f0ac957..15d565a 100644
--- a/core/modules/system/tests/common.test
+++ b/core/modules/system/tests/common.test
@@ -97,7 +97,7 @@ class CommonURLUnitTestCase extends DrupalWebTestCase {
* Tests for active class in l() function.
*/
function testLActiveClass() {
- $link = l($this->randomName(), $_GET['q']);
+ $link = l($this->randomName(), current_path());
$this->assertTrue($this->hasClass($link, 'active'), t('Class @class is present on link to the current page', array('@class' => 'active')));
}
@@ -106,7 +106,7 @@ class CommonURLUnitTestCase extends DrupalWebTestCase {
*/
function testLCustomClass() {
$class = $this->randomName();
- $link = l($this->randomName(), $_GET['q'], array('attributes' => array('class' => array($class))));
+ $link = l($this->randomName(), current_path(), array('attributes' => array('class' => array($class))));
$this->assertTrue($this->hasClass($link, $class), t('Custom class @class is present on link when requested', array('@class' => $class)));
$this->assertTrue($this->hasClass($link, 'active'), t('Class @class is present on link to the current page', array('@class' => 'active')));
}
@@ -128,19 +128,8 @@ class CommonURLUnitTestCase extends DrupalWebTestCase {
),
),
'c' => 3,
- 'q' => 'foo/bar',
);
- // Default arguments.
- $result = $_GET;
- unset($result['q']);
- $this->assertEqual(drupal_get_query_parameters(), $result, t("\$_GET['q'] was removed."));
-
- // Default exclusion.
- $result = $original;
- unset($result['q']);
- $this->assertEqual(drupal_get_query_parameters($original), $result, t("'q' was removed."));
-
// First-level exclusion.
$result = $original;
unset($result['b']);
@@ -176,14 +165,21 @@ class CommonURLUnitTestCase extends DrupalWebTestCase {
* Test drupal_parse_url().
*/
function testDrupalParseUrl() {
- // Relative URL.
- $url = 'foo/bar?foo=bar&bar=baz&baz#foo';
- $result = array(
- 'path' => 'foo/bar',
- 'query' => array('foo' => 'bar', 'bar' => 'baz', 'baz' => ''),
- 'fragment' => 'foo',
- );
- $this->assertEqual(drupal_parse_url($url), $result, t('Relative URL parsed correctly.'));
+ // Relative, absolute, and external URLs, without/with explicit script path,
+ // without/with Drupal path.
+ foreach (array('', '/', 'http://drupal.org/') as $absolute) {
+ foreach (array('', 'index.php/') as $script) {
+ foreach (array('', 'foo/bar') as $path) {
+ $url = $absolute . $script . $path . '?foo=bar&bar=baz&baz#foo';
+ $expected = array(
+ 'path' => $absolute . $script . $path,
+ 'query' => array('foo' => 'bar', 'bar' => 'baz', 'baz' => ''),
+ 'fragment' => 'foo',
+ );
+ $this->assertEqual(drupal_parse_url($url), $expected, t('URL parsed correctly.'));
+ }
+ }
+ }
// Relative URL that is known to confuse parse_url().
$url = 'foo/bar:1';
@@ -194,47 +190,10 @@ class CommonURLUnitTestCase extends DrupalWebTestCase {
);
$this->assertEqual(drupal_parse_url($url), $result, t('Relative URL parsed correctly.'));
- // Absolute URL.
- $url = '/foo/bar?foo=bar&bar=baz&baz#foo';
- $result = array(
- 'path' => '/foo/bar',
- 'query' => array('foo' => 'bar', 'bar' => 'baz', 'baz' => ''),
- 'fragment' => 'foo',
- );
- $this->assertEqual(drupal_parse_url($url), $result, t('Absolute URL parsed correctly.'));
-
- // External URL testing.
- $url = 'http://drupal.org/foo/bar?foo=bar&bar=baz&baz#foo';
-
// Test that drupal can recognize an absolute URL. Used to prevent attack vectors.
+ $url = 'http://drupal.org/foo/bar?foo=bar&bar=baz&baz#foo';
$this->assertTrue(url_is_external($url), t('Correctly identified an external URL.'));
- // Test the parsing of absolute URLs.
- $result = array(
- 'path' => 'http://drupal.org/foo/bar',
- 'query' => array('foo' => 'bar', 'bar' => 'baz', 'baz' => ''),
- 'fragment' => 'foo',
- );
- $this->assertEqual(drupal_parse_url($url), $result, t('External URL parsed correctly.'));
-
- // Verify proper parsing of URLs when clean URLs are disabled.
- $result = array(
- 'path' => 'foo/bar',
- 'query' => array('bar' => 'baz'),
- 'fragment' => 'foo',
- );
- // Non-clean URLs #1: Absolute URL generated by url().
- $url = $GLOBALS['base_url'] . '/?q=foo/bar&bar=baz#foo';
- $this->assertEqual(drupal_parse_url($url), $result, t('Absolute URL with clean URLs disabled parsed correctly.'));
-
- // Non-clean URLs #2: Relative URL generated by url().
- $url = '?q=foo/bar&bar=baz#foo';
- $this->assertEqual(drupal_parse_url($url), $result, t('Relative URL with clean URLs disabled parsed correctly.'));
-
- // Non-clean URLs #3: URL generated by url() on non-Apache webserver.
- $url = 'index.php?q=foo/bar&bar=baz#foo';
- $this->assertEqual(drupal_parse_url($url), $result, t('Relative URL on non-Apache webserver with clean URLs disabled parsed correctly.'));
-
// Test that drupal_parse_url() does not allow spoofing a URL to force a malicious redirect.
$parts = drupal_parse_url('forged:http://cwe.mitre.org/data/definitions/601.html');
$this->assertFalse(valid_url($parts['path'], TRUE), t('drupal_parse_url() correctly parsed a forged URL.'));
@@ -245,75 +204,41 @@ class CommonURLUnitTestCase extends DrupalWebTestCase {
* assert all that works when clean URLs are on and off.
*/
function testUrl() {
- global $base_url;
-
- foreach (array(FALSE, TRUE) as $absolute) {
- // Get the expected start of the path string.
- $base = $absolute ? $base_url . '/' : base_path();
- $absolute_string = $absolute ? 'absolute' : NULL;
-
- // Disable Clean URLs.
- $GLOBALS['conf']['clean_url'] = 0;
-
- $url = $base . '?q=node/123';
- $result = url('node/123', array('absolute' => $absolute));
- $this->assertEqual($url, $result, "$url == $result");
-
- $url = $base . '?q=node/123#foo';
- $result = url('node/123', array('fragment' => 'foo', 'absolute' => $absolute));
- $this->assertEqual($url, $result, "$url == $result");
-
- $url = $base . '?q=node/123&foo';
- $result = url('node/123', array('query' => array('foo' => NULL), 'absolute' => $absolute));
- $this->assertEqual($url, $result, "$url == $result");
-
- $url = $base . '?q=node/123&foo=bar&bar=baz';
- $result = url('node/123', array('query' => array('foo' => 'bar', 'bar' => 'baz'), 'absolute' => $absolute));
- $this->assertEqual($url, $result, "$url == $result");
-
- $url = $base . '?q=node/123&foo#bar';
- $result = url('node/123', array('query' => array('foo' => NULL), 'fragment' => 'bar', 'absolute' => $absolute));
- $this->assertEqual($url, $result, "$url == $result");
-
- $url = $base . '?q=node/123&foo#0';
- $result = url('node/123', array('query' => array('foo' => NULL), 'fragment' => '0', 'absolute' => $absolute));
- $this->assertEqual($url, $result, "$url == $result");
-
- $url = $base . '?q=node/123&foo';
- $result = url('node/123', array('query' => array('foo' => NULL), 'fragment' => '', 'absolute' => $absolute));
- $this->assertEqual($url, $result, "$url == $result");
-
- $url = $base;
- $result = url('', array('absolute' => $absolute));
- $this->assertEqual($url, $result, "$url == $result");
-
- // Enable Clean URLs.
- $GLOBALS['conf']['clean_url'] = 1;
-
- $url = $base . 'node/123';
- $result = url('node/123', array('absolute' => $absolute));
- $this->assertEqual($url, $result, "$url == $result");
-
- $url = $base . 'node/123#foo';
- $result = url('node/123', array('fragment' => 'foo', 'absolute' => $absolute));
- $this->assertEqual($url, $result, "$url == $result");
-
- $url = $base . 'node/123?foo';
- $result = url('node/123', array('query' => array('foo' => NULL), 'absolute' => $absolute));
- $this->assertEqual($url, $result, "$url == $result");
-
- $url = $base . 'node/123?foo=bar&bar=baz';
- $result = url('node/123', array('query' => array('foo' => 'bar', 'bar' => 'baz'), 'absolute' => $absolute));
- $this->assertEqual($url, $result, "$url == $result");
-
- $url = $base . 'node/123?foo#bar';
- $result = url('node/123', array('query' => array('foo' => NULL), 'fragment' => 'bar', 'absolute' => $absolute));
- $this->assertEqual($url, $result, "$url == $result");
-
- $url = $base;
- $result = url('', array('absolute' => $absolute));
- $this->assertEqual($url, $result, "$url == $result");
+ global $base_url, $script_path;
+
+ $script_path_original = $script_path;
+ foreach (array('', 'index.php/') as $script_path) {
+ foreach (array(FALSE, TRUE) as $absolute) {
+ // Get the expected start of the path string.
+ $base = ($absolute ? $base_url . '/' : base_path()) . $script_path;
+ $absolute_string = $absolute ? 'absolute' : NULL;
+
+ $url = $base . 'node/123';
+ $result = url('node/123', array('absolute' => $absolute));
+ $this->assertEqual($url, $result, "$url == $result");
+
+ $url = $base . 'node/123#foo';
+ $result = url('node/123', array('fragment' => 'foo', 'absolute' => $absolute));
+ $this->assertEqual($url, $result, "$url == $result");
+
+ $url = $base . 'node/123?foo';
+ $result = url('node/123', array('query' => array('foo' => NULL), 'absolute' => $absolute));
+ $this->assertEqual($url, $result, "$url == $result");
+
+ $url = $base . 'node/123?foo=bar&bar=baz';
+ $result = url('node/123', array('query' => array('foo' => 'bar', 'bar' => 'baz'), 'absolute' => $absolute));
+ $this->assertEqual($url, $result, "$url == $result");
+
+ $url = $base . 'node/123?foo#bar';
+ $result = url('node/123', array('query' => array('foo' => NULL), 'fragment' => 'bar', 'absolute' => $absolute));
+ $this->assertEqual($url, $result, "$url == $result");
+
+ $url = $base;
+ $result = url('', array('absolute' => $absolute));
+ $this->assertEqual($url, $result, "$url == $result");
+ }
}
+ $script_path = $script_path_original;
}
/**
@@ -1230,8 +1155,8 @@ class CommonJavaScriptTestCase extends DrupalWebTestCase {
$this->assertTrue(array_key_exists('core/misc/html5.js', $javascript), t('html5.js is added when file is added.'));
$this->assertTrue(array_key_exists('core/misc/collapse.js', $javascript), t('JavaScript files are correctly added.'));
$this->assertEqual(base_path(), $javascript['settings']['data'][0]['basePath'], t('Base path JavaScript setting is correctly set.'));
- url('', array('prefix' => &$prefix));
- $this->assertEqual(empty($prefix) ? '' : $prefix, $javascript['settings']['data'][1]['pathPrefix'], t('Path prefix JavaScript setting is correctly set.'));
+ $this->assertIdentical($GLOBALS['script_path'], $javascript['settings']['data'][1]['scriptPath'], t('Script path JavaScript setting is correctly set.'));
+ $this->assertIdentical('', $javascript['settings']['data'][2]['pathPrefix'], t('Path prefix JavaScript setting is correctly set.'));
}
/**
@@ -1239,8 +1164,8 @@ class CommonJavaScriptTestCase extends DrupalWebTestCase {
*/
function testAddSetting() {
$javascript = drupal_add_js(array('drupal' => 'rocks', 'dries' => 280342800), 'setting');
- $this->assertEqual(280342800, $javascript['settings']['data'][2]['dries'], t('JavaScript setting is set correctly.'));
- $this->assertEqual('rocks', $javascript['settings']['data'][2]['drupal'], t('The other JavaScript setting is set correctly.'));
+ $this->assertEqual(280342800, $javascript['settings']['data'][3]['dries'], t('JavaScript setting is set correctly.'));
+ $this->assertEqual('rocks', $javascript['settings']['data'][3]['drupal'], t('The other JavaScript setting is set correctly.'));
}
/**
@@ -1269,8 +1194,9 @@ class CommonJavaScriptTestCase extends DrupalWebTestCase {
$javascript = drupal_get_js('header');
$this->assertTrue(strpos($javascript, 'basePath') > 0, t('Rendered JavaScript header returns basePath setting.'));
- $this->assertTrue(strpos($javascript, 'core/misc/jquery.js') > 0, t('Rendered JavaScript header includes jQuery.'));
+ $this->assertTrue(strpos($javascript, 'scriptPath') > 0, t('Rendered JavaScript header returns scriptPath setting.'));
$this->assertTrue(strpos($javascript, 'pathPrefix') > 0, t('Rendered JavaScript header returns pathPrefix setting.'));
+ $this->assertTrue(strpos($javascript, 'core/misc/jquery.js') > 0, t('Rendered JavaScript header includes jQuery.'));
// Test whether drupal_add_js can be used to override a previous setting.
$this->assertTrue(strpos($javascript, 'commonTestShouldAppear') > 0, t('Rendered JavaScript header returns custom setting.'));
@@ -1424,48 +1350,6 @@ class CommonJavaScriptTestCase extends DrupalWebTestCase {
}
/**
- * Tests JavaScript aggregation when files are added to a different scope.
- */
- function testAggregationOrder() {
- // Enable JavaScript aggregation.
- config('system.performance')->set('preprocess_js', 1)->save();
- drupal_static_reset('drupal_add_js');
-
- // Add two JavaScript files to the current request and build the cache.
- drupal_add_js('core/misc/ajax.js');
- drupal_add_js('core/misc/autocomplete.js');
-
- $js_items = drupal_add_js();
- drupal_build_js_cache(array(
- 'core/misc/ajax.js' => $js_items['core/misc/ajax.js'],
- 'core/misc/autocomplete.js' => $js_items['core/misc/autocomplete.js']
- ));
-
- // Store the expected key for the first item in the cache.
- $cache = array_keys(variable_get('drupal_js_cache_files', array()));
- $expected_key = $cache[0];
-
- // Reset variables and add a file in a different scope first.
- variable_del('drupal_js_cache_files');
- drupal_static_reset('drupal_add_js');
- drupal_add_js('some/custom/javascript_file.js', array('scope' => 'footer'));
- drupal_add_js('core/misc/ajax.js');
- drupal_add_js('core/misc/autocomplete.js');
-
- // Rebuild the cache.
- $js_items = drupal_add_js();
- drupal_build_js_cache(array(
- 'core/misc/ajax.js' => $js_items['core/misc/ajax.js'],
- 'core/misc/autocomplete.js' => $js_items['core/misc/autocomplete.js']
- ));
-
- // Compare the expected key for the first file to the current one.
- $cache = array_keys(variable_get('drupal_js_cache_files', array()));
- $key = $cache[0];
- $this->assertEqual($key, $expected_key, 'JavaScript aggregation is not affected by ordering in different scopes.');
- }
-
- /**
* Test JavaScript ordering.
*/
function testRenderOrder() {
@@ -1863,15 +1747,6 @@ class CommonDrupalRenderTestCase extends DrupalWebTestCase {
':title' => $element['#title'],
));
- $element = array(
- '#type' => 'fieldset',
- '#title' => $this->randomName(),
- '#collapsible' => TRUE,
- );
- $this->assertRenderedElement($element, '//fieldset[contains(@class, :class)]', array(
- ':class' => 'collapsible',
- ));
-
$element['item'] = array(
'#type' => 'item',
'#title' => $this->randomName(),
@@ -1974,8 +1849,8 @@ class CommonValidUrlUnitTestCase extends DrupalUnitTestCase {
'example.com/index.html#pagetop',
'example.com:8080',
'subdomain.example.com',
- 'example.com/index.php?q=node',
- 'example.com/index.php?q=node¶m=false',
+ 'example.com/index.php/node',
+ 'example.com/index.php/node?param=false',
'user@www.example.com',
'user:pass@www.example.com:8080/login.php?do=login&style=%23#pagetop',
'127.0.0.1',
@@ -2022,8 +1897,8 @@ class CommonValidUrlUnitTestCase extends DrupalUnitTestCase {
$valid_relative_urls = array(
'paren(the)sis',
'index.html#pagetop',
- 'index.php?q=node',
- 'index.php?q=node¶m=false',
+ 'index.php/node',
+ 'index.php/node?param=false',
'login.php?do=login&style=%23#pagetop',
);
diff --git a/core/modules/system/tests/file.test b/core/modules/system/tests/file.test
index 173d05a..00bda25 100644
--- a/core/modules/system/tests/file.test
+++ b/core/modules/system/tests/file.test
@@ -2042,19 +2042,6 @@ class FileSaveTest extends FileHookTestCase {
$this->assertNotNull($loaded_file, t("Record still exists in the database."), 'File');
$this->assertEqual($loaded_file->status, $saved_file->status, t("Status was saved correctly."));
$this->assertEqual($loaded_file->langcode, 'en', t("Langcode was saved correctly."));
-
- // Try to insert a second file with the same name apart from case insensitivity
- // to ensure the 'uri' index allows for filenames with different cases.
- $file = (object) array(
- 'uid' => 1,
- 'filename' => 'DRUPLICON.txt',
- 'uri' => 'public://DRUPLICON.txt',
- 'filemime' => 'text/plain',
- 'timestamp' => 1,
- 'status' => FILE_STATUS_PERMANENT,
- );
- file_put_contents($file->uri, 'hello world');
- file_save($file);
}
}
@@ -2436,7 +2423,7 @@ class FileDownloadTest extends FileTestCase {
$this->checkUrl('public', '', $basename, $base_url . '/' . file_stream_wrapper_get_instance_by_scheme('public')->getDirectoryPath() . '/' . $basename_encoded);
$this->checkUrl('private', '', $basename, $base_url . '/system/files/' . $basename_encoded);
- $this->checkUrl('private', '', $basename, $base_url . '/?q=system/files/' . $basename_encoded, '0');
+ $this->checkUrl('private', '', $basename, $base_url . '/index.php/system/files/' . $basename_encoded, '0');
}
/**
diff --git a/core/modules/system/tests/menu.test b/core/modules/system/tests/menu.test
index 0a10ec8..65f4443 100644
--- a/core/modules/system/tests/menu.test
+++ b/core/modules/system/tests/menu.test
@@ -262,11 +262,11 @@ class MenuRouterTestCase extends DrupalWebTestCase {
$this->drupalGet('user/login');
// Check that we got to 'user'.
- $this->assertTrue($this->url == url('user', array('absolute' => TRUE)), t("Logged-in user redirected to q=user on accessing q=user/login"));
+ $this->assertTrue($this->url == url('user', array('absolute' => TRUE)), t("Logged-in user redirected to user on accessing user/login"));
// user/register should redirect to user/UID/edit.
$this->drupalGet('user/register');
- $this->assertTrue($this->url == url('user/' . $this->loggedInUser->uid . '/edit', array('absolute' => TRUE)), t("Logged-in user redirected to q=user/UID/edit on accessing q=user/register"));
+ $this->assertTrue($this->url == url('user/' . $this->loggedInUser->uid . '/edit', array('absolute' => TRUE)), t("Logged-in user redirected to user/UID/edit on accessing user/register"));
}
/**
@@ -1321,7 +1321,7 @@ class MenuBreadcrumbTestCase extends MenuWebTestCase {
// the breadcrumb based on taxonomy term hierarchy.
$parent_tid = 0;
foreach ($tags as $name => $null) {
- $terms = taxonomy_term_load_multiple(FALSE, array('name' => $name));
+ $terms = taxonomy_term_load_multiple(NULL, array('name' => $name));
$term = reset($terms);
$tags[$name]['term'] = $term;
if ($parent_tid) {
diff --git a/core/modules/system/tests/modules/form_test/form_test.module b/core/modules/system/tests/modules/form_test/form_test.module
index f42b5f5..c727c51 100644
--- a/core/modules/system/tests/modules/form_test/form_test.module
+++ b/core/modules/system/tests/modules/form_test/form_test.module
@@ -1932,9 +1932,7 @@ function form_test_form_user_register_form_alter(&$form, &$form_state) {
);
// If requested, add the test field by attaching the node page form.
if (!empty($_REQUEST['field'])) {
- $node = entity_create('node', array(
- 'type' => 'page',
- ));
+ $node = (object)array('type' => 'page');
field_attach_form('node', $node, $form, $form_state);
}
}
@@ -1952,12 +1950,12 @@ function form_test_user_register_form_rebuild($form, &$form_state) {
*/
function form_test_two_instances() {
global $user;
- $node1 = entity_create('node', array(
+ $node1 = (object) array(
'uid' => $user->uid,
'name' => (isset($user->name) ? $user->name : ''),
'type' => 'page',
'langcode' => LANGUAGE_NOT_SPECIFIED,
- ));
+ );
$node2 = clone($node1);
$return['node_form_1'] = drupal_get_form('page_node_form', $node1);
$return['node_form_2'] = drupal_get_form('page_node_form', $node2);
diff --git a/core/modules/system/tests/modules/menu_test/menu_test.module b/core/modules/system/tests/modules/menu_test/menu_test.module
index 0b954ae..6e6bb4d 100644
--- a/core/modules/system/tests/modules/menu_test/menu_test.module
+++ b/core/modules/system/tests/modules/menu_test/menu_test.module
@@ -537,7 +537,7 @@ function menu_test_static_variable($value = NULL) {
* Implements hook_menu_site_status_alter().
*/
function menu_test_menu_site_status_alter(&$menu_site_status, $path) {
- // Allow access to ?q=menu_login_callback even if in maintenance mode.
+ // Allow access to menu_login_callback even if in maintenance mode.
if ($menu_site_status == MENU_SITE_OFFLINE && $path == 'menu_login_callback') {
$menu_site_status = MENU_SITE_ONLINE;
}
diff --git a/core/modules/system/tests/modules/system_module_test/system_module_test.info b/core/modules/system/tests/modules/system_module_test/system_module_test.info
deleted file mode 100644
index 5184a33..0000000
--- a/core/modules/system/tests/modules/system_module_test/system_module_test.info
+++ /dev/null
@@ -1,6 +0,0 @@
-name = "System test"
-description = "Provides hook implementations for testing System module functionality."
-package = Testing
-version = VERSION
-core = 8.x
-hidden = TRUE
diff --git a/core/modules/system/tests/modules/system_module_test/system_module_test.module b/core/modules/system/tests/modules/system_module_test/system_module_test.module
deleted file mode 100644
index ec90b15..0000000
--- a/core/modules/system/tests/modules/system_module_test/system_module_test.module
+++ /dev/null
@@ -1,10 +0,0 @@
- 'theme_test.template_test',
);
- $items['theme_test_foo'] = array(
- 'variables' => array('foo' => NULL),
- );
return $items;
}
@@ -145,10 +142,3 @@ function theme_test_preprocess_html(&$variables) {
$variables['html_attributes_array']['theme_test_html_attribute'] = 'theme test html attribute value';
$variables['body_attributes_array']['theme_test_body_attribute'] = 'theme test body attribute value';
}
-
-/**
- * Theme function for testing theme('theme_test_foo').
- */
-function theme_theme_test_foo($variables) {
- return $variables['foo'];
-}
diff --git a/core/modules/system/tests/modules/url_alter_test/url_alter_test.module b/core/modules/system/tests/modules/url_alter_test/url_alter_test.module
index 9287ff5..a5ca13d 100644
--- a/core/modules/system/tests/modules/url_alter_test/url_alter_test.module
+++ b/core/modules/system/tests/modules/url_alter_test/url_alter_test.module
@@ -30,8 +30,8 @@ function url_alter_test_foo() {
* Implements hook_url_inbound_alter().
*/
function url_alter_test_url_inbound_alter(&$path, $original_path, $path_language) {
- if (!request_path() && !empty($_GET['q'])) {
- drupal_set_message("\$_GET['q'] is non-empty with an empty request path.");
+ if (!request_path() && current_path()) {
+ drupal_set_message("current_path() is non-empty with an empty request path.");
}
// Rewrite user/username to user/uid.
diff --git a/core/modules/system/tests/path.test b/core/modules/system/tests/path.test
index fe6f734..f02a9b4 100644
--- a/core/modules/system/tests/path.test
+++ b/core/modules/system/tests/path.test
@@ -201,11 +201,11 @@ class UrlAlterFunctionalTest extends DrupalWebTestCase {
}
/**
- * Tests that $_GET['q'] is initialized when the request path is empty.
+ * Tests that current_path() is initialized when the request path is empty.
*/
function testGetQInitialized() {
$this->drupalGet('');
- $this->assertText("\$_GET['q'] is non-empty with an empty request path.", "\$_GET['q'] is initialized with an empty request path.");
+ $this->assertText("current_path() is non-empty with an empty request path.", "current_path() is initialized with an empty request path.");
}
/**
@@ -221,7 +221,7 @@ class UrlAlterFunctionalTest extends DrupalWebTestCase {
protected function assertUrlOutboundAlter($original, $final) {
// Test outbound altering.
$result = url($original);
- $base_path = base_path() . (variable_get('clean_url', '0') ? '' : '?q=');
+ $base_path = base_path() . $GLOBALS['script_path'];
$result = substr($result, strlen($base_path));
$this->assertIdentical($result, $final, t('Altered outbound URL %original, expected %final, and got %result.', array('%original' => $original, '%final' => $final, '%result' => $result)));
}
diff --git a/core/modules/system/tests/session.test b/core/modules/system/tests/session.test
index 5cc8fe9..0e6a074 100644
--- a/core/modules/system/tests/session.test
+++ b/core/modules/system/tests/session.test
@@ -41,8 +41,8 @@ class SessionTestCase extends DrupalWebTestCase {
// Verify that the session is regenerated if a module calls exit
// in hook_user_login().
+ user_save($user, array('name' => 'session_test_user'));
$user->name = 'session_test_user';
- $user->save();
$this->drupalGet('session-test/id');
$matches = array();
preg_match('/\s*session_id:(.*)\n/', $this->drupalGetContent(), $matches);
@@ -513,7 +513,7 @@ class SessionHttpsTestCase extends DrupalWebTestCase {
*/
protected function httpsUrl($url) {
global $base_url;
- return $base_url . '/core/modules/system/tests/https.php?q=' . $url;
+ return $base_url . '/core/modules/system/tests/https.php/' . $url;
}
/**
@@ -527,7 +527,7 @@ class SessionHttpsTestCase extends DrupalWebTestCase {
*/
protected function httpUrl($url) {
global $base_url;
- return $base_url . '/core/modules/system/tests/http.php?q=' . $url;
+ return $base_url . '/core/modules/system/tests/http.php/' . $url;
}
}
diff --git a/core/modules/system/tests/tablesort.test b/core/modules/system/tests/tablesort.test
index 9c068f8..aaea505 100644
--- a/core/modules/system/tests/tablesort.test
+++ b/core/modules/system/tests/tablesort.test
@@ -49,7 +49,7 @@ class TableSortTest extends DrupalUnitTestCase {
$headers = array('foo', 'bar', 'baz');
// Reset $_GET to prevent parameters from Simpletest and Batch API ending
// up in $ts['query'].
- $_GET = array('q' => 'jahwohl');
+ $_GET = array();
$expected_ts = array(
'name' => 'foo',
'sql' => '',
@@ -64,7 +64,6 @@ class TableSortTest extends DrupalUnitTestCase {
// override the default.
$_GET = array(
- 'q' => 'jahwohl',
// This should not override the table order because only complex
// headers are overridable.
'order' => 'bar',
@@ -77,7 +76,6 @@ class TableSortTest extends DrupalUnitTestCase {
// override the default.
$_GET = array(
- 'q' => 'jahwohl',
'sort' => 'DESC',
// Add an unrelated parameter to ensure that tablesort will include
// it in the links that it creates.
@@ -107,7 +105,6 @@ class TableSortTest extends DrupalUnitTestCase {
);
// Reset $_GET from previous assertion.
$_GET = array(
- 'q' => 'jahwohl',
'order' => '2',
);
$ts = tablesort_init($headers);
@@ -124,7 +121,6 @@ class TableSortTest extends DrupalUnitTestCase {
// override the default.
$_GET = array(
- 'q' => 'jahwohl',
// This should not override the table order because this header does not
// exist.
'order' => 'bar',
@@ -144,7 +140,6 @@ class TableSortTest extends DrupalUnitTestCase {
// override the default.
$_GET = array(
- 'q' => 'jahwohl',
'order' => '1',
'sort' => 'ASC',
// Add an unrelated parameter to ensure that tablesort will include
diff --git a/core/modules/system/tests/theme.test b/core/modules/system/tests/theme.test
index c1ba08f..70d3656 100644
--- a/core/modules/system/tests/theme.test
+++ b/core/modules/system/tests/theme.test
@@ -69,14 +69,14 @@ class ThemeUnitTest extends DrupalWebTestCase {
* Ensure page-front template suggestion is added when on front page.
*/
function testFrontPageThemeSuggestion() {
- $q = $_GET['q'];
- // Set $_GET['q'] to node because theme_get_suggestions() will query it to
- // see if we are on the front page.
+ $original_path = _current_path();
+ // Set the current path to node because theme_get_suggestions() will query
+ // it to see if we are on the front page.
variable_set('site_frontpage', 'node');
- $_GET['q'] = 'node';
- $suggestions = theme_get_suggestions(explode('/', $_GET['q']), 'page');
+ _current_path('node');
+ $suggestions = theme_get_suggestions(array('node'), 'page');
// Set it back to not annoy the batch runner.
- $_GET['q'] = $q;
+ _current_path($original_path);
$this->assertTrue(in_array('page__front', $suggestions), t('Front page template was suggested.'));
}
@@ -154,19 +154,6 @@ class ThemeUnitTest extends DrupalWebTestCase {
$this->assertNotEqual(theme_get_setting('subtheme_override', 'test_basetheme'), theme_get_setting('subtheme_override', 'test_subtheme'), t('Base theme\'s default settings values can be overridden by subtheme.'));
$this->assertIdentical(theme_get_setting('basetheme_only', 'test_subtheme'), 'base theme value', t('Base theme\'s default settings values are inherited by subtheme.'));
}
-
- /**
- * Ensures the theme registry is rebuilt when modules are disabled/enabled.
- */
- function testRegistryRebuild() {
- $this->assertIdentical(theme('theme_test_foo', array('foo' => 'a')), 'a', 'The theme registry contains theme_test_foo.');
-
- module_disable(array('theme_test'), FALSE);
- $this->assertIdentical(theme('theme_test_foo', array('foo' => 'b')), '', 'The theme registry does not contain theme_test_foo, because the module is disabled.');
-
- module_enable(array('theme_test'), FALSE);
- $this->assertIdentical(theme('theme_test_foo', array('foo' => 'c')), 'c', 'The theme registry contains theme_test_foo again after re-enabling the module.');
- }
}
/**
@@ -317,7 +304,7 @@ class ThemeFunctionsTestCase extends DrupalWebTestCase {
// Required to verify the "active" class in expected links below, and
// because the current path is different when running tests manually via
// simpletest.module ('batch') and via the testing framework ('').
- $_GET['q'] = variable_get('site_frontpage', 'user');
+ _current_path(variable_get('site_frontpage', 'user'));
// Verify that a list of links is properly rendered.
$variables = array();
diff --git a/core/modules/system/tests/upgrade/upgrade.test b/core/modules/system/tests/upgrade/upgrade.test
index e4045be..52d7800 100644
--- a/core/modules/system/tests/upgrade/upgrade.test
+++ b/core/modules/system/tests/upgrade/upgrade.test
@@ -78,7 +78,6 @@ abstract class UpgradePathTestCase extends DrupalWebTestCase {
$this->originalLanguageDefault = variable_get('language_default');
$this->originalFileDirectory = variable_get('file_public_path', conf_path() . '/files');
$this->originalProfile = drupal_get_profile();
- $clean_url_original = variable_get('clean_url', 0);
// Unregister the registry.
// This is required to make sure that the database layer works properly.
@@ -138,7 +137,6 @@ abstract class UpgradePathTestCase extends DrupalWebTestCase {
drupal_save_session(FALSE);
// Restore necessary variables.
- $this->variable_set('clean_url', $clean_url_original);
$this->variable_set('site_mail', 'simpletest@example.com');
drupal_set_time_limit($this->timeLimit);
diff --git a/core/modules/taxonomy/taxonomy.admin.inc b/core/modules/taxonomy/taxonomy.admin.inc
index a95b856..9b23005 100644
--- a/core/modules/taxonomy/taxonomy.admin.inc
+++ b/core/modules/taxonomy/taxonomy.admin.inc
@@ -422,7 +422,7 @@ function taxonomy_overview_terms($form, &$form_state, TaxonomyVocabulary $vocabu
'#type' => 'submit',
'#value' => t('Reset to alphabetical')
);
- $form_state['redirect'] = array($_GET['q'], (isset($_GET['page']) ? array('query' => array('page' => $_GET['page'])) : array()));
+ $form_state['redirect'] = array(current_path(), (isset($_GET['page']) ? array('query' => array('page' => $_GET['page'])) : array()));
}
return $form;
@@ -784,7 +784,7 @@ function taxonomy_form_term($form, &$form_state, TaxonomyTerm $term = NULL, Taxo
);
}
else {
- $form_state['redirect'] = $_GET['q'];
+ $form_state['redirect'] = current_path();
}
return $form;
diff --git a/core/modules/taxonomy/taxonomy.module b/core/modules/taxonomy/taxonomy.module
index 024f3ed..e82edfc 100644
--- a/core/modules/taxonomy/taxonomy.module
+++ b/core/modules/taxonomy/taxonomy.module
@@ -5,8 +5,6 @@
* Enables the organization of content into categories.
*/
-use Drupal\node\Node;
-
/**
* Denotes that no term in the vocabulary has a parent.
*/
@@ -940,53 +938,53 @@ function taxonomy_term_load_multiple_by_name($name, $vocabulary = NULL) {
* from the database. Terms are loaded into memory and will not require
* database access if loaded again during the same page request.
*
- * @see entity_load_multiple()
+ * @see entity_load()
* @see EntityFieldQuery
*
- * @param array|bool $tids
- * An array of taxonomy term IDs, or FALSE to load all terms.
- * @param array $conditions
+ * @param $tids
+ * An array of taxonomy term IDs.
+ * @param $conditions
* (deprecated) An associative array of conditions on the {taxonomy_term}
* table, where the keys are the database fields and the values are the
* values those fields must have. Instead, it is preferable to use
* EntityFieldQuery to retrieve a list of entity IDs loadable by
* this function.
*
- * @return array
+ * @return
* An array of taxonomy term entities, indexed by tid. When no results are
* found, an empty array is returned.
*
* @todo Remove $conditions in Drupal 8.
*/
-function taxonomy_term_load_multiple($tids = array(), array $conditions = array()) {
- return entity_load_multiple('taxonomy_term', $tids, $conditions);
+function taxonomy_term_load_multiple($tids = array(), $conditions = array()) {
+ return entity_load('taxonomy_term', $tids, $conditions);
}
/**
- * Loads multiple taxonomy vocabularies based on certain conditions.
+ * Load multiple taxonomy vocabularies based on certain conditions.
*
* This function should be used whenever you need to load more than one
* vocabulary from the database. Terms are loaded into memory and will not
* require database access if loaded again during the same page request.
*
- * @see entity_load_multiple()
+ * @see entity_load()
*
- * @param array|bool $vids
+ * @param $vids
* An array of taxonomy vocabulary IDs, or FALSE to load all vocabularies.
- * @param array $conditions
+ * @param $conditions
* An array of conditions to add to the query.
*
- * @return array
+ * @return
* An array of vocabulary objects, indexed by vid.
*/
-function taxonomy_vocabulary_load_multiple($vids = array(), array $conditions = array()) {
- return entity_load_multiple('taxonomy_vocabulary', $vids, $conditions);
+function taxonomy_vocabulary_load_multiple($vids = array(), $conditions = array()) {
+ return entity_load('taxonomy_vocabulary', $vids, $conditions);
}
/**
* Return the taxonomy vocabulary entity matching a vocabulary ID.
*
- * @param int $vid
+ * @param $vid
* The vocabulary's ID.
*
* @return TaxonomyVocabulary|false
@@ -996,7 +994,8 @@ function taxonomy_vocabulary_load_multiple($vids = array(), array $conditions =
* @see taxonomy_vocabulary_machine_name_load()
*/
function taxonomy_vocabulary_load($vid) {
- return entity_load('taxonomy_vocabulary', $vid);
+ $vocabularies = taxonomy_vocabulary_load_multiple(array($vid));
+ return reset($vocabularies);
}
/**
@@ -1012,8 +1011,8 @@ function taxonomy_vocabulary_load($vid) {
* @see taxonomy_vocabulary_load()
*/
function taxonomy_vocabulary_machine_name_load($name) {
- $result = entity_load_multiple('taxonomy_vocabulary', FALSE, array('machine_name' => $name));
- return reset($result);
+ $vocabularies = taxonomy_vocabulary_load_multiple(NULL, array('machine_name' => $name));
+ return reset($vocabularies);
}
/**
@@ -1029,7 +1028,8 @@ function taxonomy_term_load($tid) {
if (!is_numeric($tid)) {
return FALSE;
}
- return entity_load('taxonomy_term', $tid);
+ $term = taxonomy_term_load_multiple(array($tid), array());
+ return $term ? $term[$tid] : FALSE;
}
/**
@@ -1124,7 +1124,7 @@ function taxonomy_field_widget_info_alter(&$info) {
/**
* Implements hook_options_list().
*/
-function taxonomy_options_list($field, $instance, $entity_type, $entity) {
+function taxonomy_options_list($field, $instance) {
$function = !empty($field['settings']['options_list_callback']) ? $field['settings']['options_list_callback'] : 'taxonomy_allowed_values';
return $function($field);
}
@@ -1328,7 +1328,7 @@ function taxonomy_field_formatter_prepare_view($entity_type, $entities, $field,
$items[$id][$delta]['taxonomy_term'] = $terms[$item['tid']];
}
// Terms to be created are not in $terms, but are still legitimate.
- elseif ($item['tid'] == 'autocreate') {
+ else if ($item['tid'] == 'autocreate') {
// Leave the item in place.
}
// Otherwise, unset the instance value, since the term does not exist.
@@ -1543,7 +1543,7 @@ function taxonomy_field_presave($entity_type, $entity, $field, $instance, $langc
/**
* Implements hook_node_insert().
*/
-function taxonomy_node_insert(Node $node) {
+function taxonomy_node_insert($node) {
// Add taxonomy index entries for the node.
taxonomy_build_node_index($node);
}
@@ -1554,8 +1554,8 @@ function taxonomy_node_insert(Node $node) {
* The index lists all terms that are related to a given node entity, and is
* therefore maintained at the entity level.
*
- * @param Drupal\node\Node $node
- * The node entity.
+ * @param $node
+ * The node object.
*/
function taxonomy_build_node_index($node) {
// We maintain a denormalized table of term/node relationships, containing
@@ -1620,7 +1620,7 @@ function taxonomy_build_node_index($node) {
/**
* Implements hook_node_update().
*/
-function taxonomy_node_update(Node $node) {
+function taxonomy_node_update($node) {
// Always rebuild the node's taxonomy index entries on node save.
taxonomy_delete_node_index($node);
taxonomy_build_node_index($node);
@@ -1629,7 +1629,7 @@ function taxonomy_node_update(Node $node) {
/**
* Implements hook_node_predelete().
*/
-function taxonomy_node_predelete(Node $node) {
+function taxonomy_node_predelete($node) {
// Clean up the {taxonomy_index} table when nodes are deleted.
taxonomy_delete_node_index($node);
}
@@ -1637,10 +1637,10 @@ function taxonomy_node_predelete(Node $node) {
/**
* Deletes taxonomy index entries for a given node.
*
- * @param Drupal\node\Node $node
- * The node entity.
+ * @param $node
+ * The node object.
*/
-function taxonomy_delete_node_index(Node $node) {
+function taxonomy_delete_node_index($node) {
if (variable_get('taxonomy_maintain_index_table', TRUE)) {
db_delete('taxonomy_index')->condition('nid', $node->nid)->execute();
}
diff --git a/core/modules/taxonomy/taxonomy.test b/core/modules/taxonomy/taxonomy.test
index 5c16884..d62b429 100644
--- a/core/modules/taxonomy/taxonomy.test
+++ b/core/modules/taxonomy/taxonomy.test
@@ -765,9 +765,8 @@ class TaxonomyTermTestCase extends TaxonomyWebTestCase {
$path = 'taxonomy/autocomplete/taxonomy_';
$path .= $this->vocabulary->machine_name . '/' . $input;
// The result order is not guaranteed, so check each term separately.
- $url = url($path, array('absolute' => TRUE));
- $result = drupal_http_request($url);
- $data = drupal_json_decode($result->data);
+ $result = $this->drupalGet($path);
+ $data = drupal_json_decode($result);
$this->assertEqual($data[$first_term->name], check_plain($first_term->name), 'Autocomplete returned the first matching term');
$this->assertEqual($data[$second_term->name], check_plain($second_term->name), 'Autocomplete returned the second matching term');
@@ -1252,12 +1251,17 @@ class TaxonomyTermIndexTestCase extends TaxonomyWebTestCase {
$this->assertEqual(1, $index_count, 'Term 2 is indexed once.');
// Redo the above tests without interface.
- $node->title = $this->randomName();
- unset($node->{$this->field_name_1});
- unset($node->{$this->field_name_2});
+ $update_node = array(
+ 'nid' => $node->nid,
+ 'vid' => $node->vid,
+ 'uid' => $node->uid,
+ 'type' => $node->type,
+ 'title' => $this->randomName(),
+ );
// Update the article with no term changed.
- $node->save();
+ $updated_node = (object) $update_node;
+ node_save($updated_node);
// Check that the index was not changed.
$index_count = db_query('SELECT COUNT(*) FROM {taxonomy_index} WHERE nid = :nid AND tid = :tid', array(
@@ -1272,8 +1276,9 @@ class TaxonomyTermIndexTestCase extends TaxonomyWebTestCase {
$this->assertEqual(1, $index_count, 'Term 2 is indexed once.');
// Update the article to change one term.
- $node->{$this->field_name_1}[$langcode] = array(array('tid' => $term_1->tid));
- $node->save();
+ $update_node[$this->field_name_1][$langcode] = array(array('tid' => $term_1->tid));
+ $updated_node = (object) $update_node;
+ node_save($updated_node);
// Check that both terms are indexed.
$index_count = db_query('SELECT COUNT(*) FROM {taxonomy_index} WHERE nid = :nid AND tid = :tid', array(
@@ -1288,8 +1293,9 @@ class TaxonomyTermIndexTestCase extends TaxonomyWebTestCase {
$this->assertEqual(1, $index_count, 'Term 2 is indexed.');
// Update the article to change another term.
- $node->{$this->field_name_2}[$langcode] = array(array('tid' => $term_1->tid));
- $node->save();
+ $update_node[$this->field_name_2][$langcode] = array(array('tid' => $term_1->tid));
+ $updated_node = (object) $update_node;
+ node_save($updated_node);
// Check that only one term is indexed.
$index_count = db_query('SELECT COUNT(*) FROM {taxonomy_index} WHERE nid = :nid AND tid = :tid', array(
@@ -1355,7 +1361,7 @@ class TaxonomyLoadMultipleUnitTest extends TaxonomyWebTestCase {
$this->createTerm($vocabulary);
}
// Load the terms from the vocabulary.
- $terms = taxonomy_term_load_multiple(FALSE, array('vid' => $vocabulary->vid));
+ $terms = taxonomy_term_load_multiple(NULL, array('vid' => $vocabulary->vid));
$count = count($terms);
$this->assertTrue($count == 5, format_string('Correct number of terms were loaded. !count terms.', array('!count' => $count)));
@@ -1375,7 +1381,7 @@ class TaxonomyLoadMultipleUnitTest extends TaxonomyWebTestCase {
$this->assertFalse($deleted_term);
// Load terms from the vocabulary by vid.
- $terms4 = taxonomy_term_load_multiple(FALSE, array('vid' => $vocabulary->vid));
+ $terms4 = taxonomy_term_load_multiple(NULL, array('vid' => $vocabulary->vid));
$this->assertTrue(count($terms4 == 4), 'Correct number of terms were loaded.');
$this->assertFalse(isset($terms4[$deleted->tid]));
diff --git a/core/modules/tracker/lib/Drupal/tracker/Tests/TrackerTest.php b/core/modules/tracker/lib/Drupal/tracker/Tests/TrackerTest.php
deleted file mode 100644
index 5e689ff..0000000
--- a/core/modules/tracker/lib/Drupal/tracker/Tests/TrackerTest.php
+++ /dev/null
@@ -1,274 +0,0 @@
- 'Tracker',
- 'description' => 'Create and delete nodes and check for their display in the tracker listings.',
- 'group' => 'Tracker'
- );
- }
-
- function setUp() {
- parent::setUp('comment', 'tracker');
-
- $this->drupalCreateContentType(array('type' => 'page', 'name' => 'Basic page'));
-
- $permissions = array('access comments', 'create page content', 'post comments', 'skip comment approval');
- $this->user = $this->drupalCreateUser($permissions);
- $this->other_user = $this->drupalCreateUser($permissions);
-
- // Make node preview optional.
- variable_set('comment_preview_page', 0);
- }
-
- /**
- * Tests for the presence of nodes on the global tracker listing.
- */
- function testTrackerAll() {
- $this->drupalLogin($this->user);
-
- $unpublished = $this->drupalCreateNode(array(
- 'title' => $this->randomName(8),
- 'status' => 0,
- ));
- $published = $this->drupalCreateNode(array(
- 'title' => $this->randomName(8),
- 'status' => 1,
- ));
-
- $this->drupalGet('tracker');
- $this->assertNoText($unpublished->title, t('Unpublished node do not show up in the tracker listing.'));
- $this->assertText($published->title, t('Published node show up in the tracker listing.'));
- $this->assertLink(t('My recent content'), 0, t('User tab shows up on the global tracker page.'));
-
- // Delete a node and ensure it no longer appears on the tracker.
- node_delete($published->nid);
- $this->drupalGet('tracker');
- $this->assertNoText($published->title, t('Deleted node do not show up in the tracker listing.'));
- }
-
- /**
- * Tests for the presence of nodes on a user's tracker listing.
- */
- function testTrackerUser() {
- $this->drupalLogin($this->user);
-
- $unpublished = $this->drupalCreateNode(array(
- 'title' => $this->randomName(8),
- 'uid' => $this->user->uid,
- 'status' => 0,
- ));
- $my_published = $this->drupalCreateNode(array(
- 'title' => $this->randomName(8),
- 'uid' => $this->user->uid,
- 'status' => 1,
- ));
- $other_published_no_comment = $this->drupalCreateNode(array(
- 'title' => $this->randomName(8),
- 'uid' => $this->other_user->uid,
- 'status' => 1,
- ));
- $other_published_my_comment = $this->drupalCreateNode(array(
- 'title' => $this->randomName(8),
- 'uid' => $this->other_user->uid,
- 'status' => 1,
- ));
- $comment = array(
- 'subject' => $this->randomName(),
- 'comment_body[' . LANGUAGE_NOT_SPECIFIED . '][0][value]' => $this->randomName(20),
- );
- $this->drupalPost('comment/reply/' . $other_published_my_comment->nid, $comment, t('Save'));
-
- $this->drupalGet('user/' . $this->user->uid . '/track');
- $this->assertNoText($unpublished->title, t("Unpublished nodes do not show up in the users's tracker listing."));
- $this->assertText($my_published->title, t("Published nodes show up in the user's tracker listing."));
- $this->assertNoText($other_published_no_comment->title, t("Other user's nodes do not show up in the user's tracker listing."));
- $this->assertText($other_published_my_comment->title, t("Nodes that the user has commented on appear in the user's tracker listing."));
-
- // Verify that unpublished comments are removed from the tracker.
- $admin_user = $this->drupalCreateUser(array('post comments', 'administer comments', 'access user profiles'));
- $this->drupalLogin($admin_user);
- $this->drupalPost('comment/1/edit', array('status' => COMMENT_NOT_PUBLISHED), t('Save'));
- $this->drupalGet('user/' . $this->user->uid . '/track');
- $this->assertNoText($other_published_my_comment->title, 'Unpublished comments are not counted on the tracker listing.');
- }
-
- /**
- * Tests for the presence of the "new" flag for nodes.
- */
- function testTrackerNewNodes() {
- $this->drupalLogin($this->user);
-
- $edit = array(
- 'title' => $this->randomName(8),
- );
-
- $node = $this->drupalCreateNode($edit);
- $title = $edit['title'];
- $this->drupalGet('tracker');
- $this->assertPattern('/' . $title . '.*new/', t('New nodes are flagged as such in the tracker listing.'));
-
- $this->drupalGet('node/' . $node->nid);
- $this->drupalGet('tracker');
- $this->assertNoPattern('/' . $title . '.*new/', t('Visited nodes are not flagged as new.'));
-
- $this->drupalLogin($this->other_user);
- $this->drupalGet('tracker');
- $this->assertPattern('/' . $title . '.*new/', t('For another user, new nodes are flagged as such in the tracker listing.'));
-
- $this->drupalGet('node/' . $node->nid);
- $this->drupalGet('tracker');
- $this->assertNoPattern('/' . $title . '.*new/', t('For another user, visited nodes are not flagged as new.'));
- }
-
- /**
- * Tests for comment counters on the tracker listing.
- */
- function testTrackerNewComments() {
- $this->drupalLogin($this->user);
-
- $node = $this->drupalCreateNode(array(
- 'comment' => 2,
- 'title' => array(LANGUAGE_NOT_SPECIFIED => array(array('value' => $this->randomName(8)))),
- ));
-
- // Add a comment to the page.
- $comment = array(
- 'subject' => $this->randomName(),
- 'comment_body[' . LANGUAGE_NOT_SPECIFIED . '][0][value]' => $this->randomName(20),
- );
- // The new comment is automatically viewed by the current user.
- $this->drupalPost('comment/reply/' . $node->nid, $comment, t('Save'));
-
- $this->drupalLogin($this->other_user);
- $this->drupalGet('tracker');
- $this->assertText('1 new', t('New comments are counted on the tracker listing pages.'));
- $this->drupalGet('node/' . $node->nid);
-
- // Add another comment as other_user.
- $comment = array(
- 'subject' => $this->randomName(),
- 'comment_body[' . LANGUAGE_NOT_SPECIFIED . '][0][value]' => $this->randomName(20),
- );
- // If the comment is posted in the same second as the last one then Drupal
- // can't tell the difference, so we wait one second here.
- sleep(1);
- $this->drupalPost('comment/reply/' . $node->nid, $comment, t('Save'));
-
- $this->drupalLogin($this->user);
- $this->drupalGet('tracker');
- $this->assertText('1 new', t('New comments are counted on the tracker listing pages.'));
- }
-
- /**
- * Tests that existing nodes are indexed by cron.
- */
- function testTrackerCronIndexing() {
- $this->drupalLogin($this->user);
-
- // Create 3 nodes.
- $edits = array();
- $nodes = array();
- for ($i = 1; $i <= 3; $i++) {
- $edits[$i] = array(
- 'comment' => 2,
- 'title' => $this->randomName(),
- );
- $nodes[$i] = $this->drupalCreateNode($edits[$i]);
- }
-
- // Add a comment to the last node as other user.
- $this->drupalLogin($this->other_user);
- $comment = array(
- 'subject' => $this->randomName(),
- 'comment_body[' . LANGUAGE_NOT_SPECIFIED . '][0][value]' => $this->randomName(20),
- );
- $this->drupalPost('comment/reply/' . $nodes[3]->nid, $comment, t('Save'));
-
- // Start indexing backwards from node 3.
- variable_set('tracker_index_nid', 3);
-
- // Clear the current tracker tables and rebuild them.
- db_delete('tracker_node')
- ->execute();
- db_delete('tracker_user')
- ->execute();
- tracker_cron();
-
- $this->drupalLogin($this->user);
-
- // Fetch the user's tracker.
- $this->drupalGet('tracker/' . $this->user->uid);
-
- // Assert that all node titles are displayed.
- foreach ($nodes as $i => $node) {
- $this->assertText($node->title, t('Node @i is displayed on the tracker listing pages.', array('@i' => $i)));
- }
- $this->assertText('1 new', t('New comment is counted on the tracker listing pages.'));
- $this->assertText('updated', t('Node is listed as updated'));
-
- // Fetch the site-wide tracker.
- $this->drupalGet('tracker');
-
- // Assert that all node titles are displayed.
- foreach ($nodes as $i => $node) {
- $this->assertText($node->title, t('Node @i is displayed on the tracker listing pages.', array('@i' => $i)));
- }
- $this->assertText('1 new', t('New comment is counted on the tracker listing pages.'));
- }
-
- /**
- * Tests that publish/unpublish works at admin/content/node.
- */
- function testTrackerAdminUnpublish() {
- $admin_user = $this->drupalCreateUser(array('access content overview', 'administer nodes', 'bypass node access'));
- $this->drupalLogin($admin_user);
-
- $node = $this->drupalCreateNode(array(
- 'comment' => 2,
- 'title' => $this->randomName(),
- ));
-
- // Assert that the node is displayed.
- $this->drupalGet('tracker');
- $this->assertText($node->title, t('Node is displayed on the tracker listing pages.'));
-
- // Unpublish the node and ensure that it's no longer displayed.
- $edit = array(
- 'operation' => 'unpublish',
- 'nodes[' . $node->nid . ']' => $node->nid,
- );
- $this->drupalPost('admin/content', $edit, t('Update'));
-
- $this->drupalGet('tracker');
- $this->assertText(t('No content available.'), t('Node is displayed on the tracker listing pages.'));
- }
-}
diff --git a/core/modules/tracker/tracker.info b/core/modules/tracker/tracker.info
index b39eb3f..a765504 100644
--- a/core/modules/tracker/tracker.info
+++ b/core/modules/tracker/tracker.info
@@ -4,3 +4,4 @@ dependencies[] = comment
package = Core
version = VERSION
core = 8.x
+files[] = tracker.test
diff --git a/core/modules/tracker/tracker.module b/core/modules/tracker/tracker.module
index dbedf12..a5887f2 100644
--- a/core/modules/tracker/tracker.module
+++ b/core/modules/tracker/tracker.module
@@ -5,8 +5,6 @@
* Tracks recent content posted by a user or users.
*/
-use Drupal\node\Node;
-
/**
* Implements hook_help().
*/
@@ -192,7 +190,7 @@ function _tracker_user_access($account) {
*
* Adds new tracking information for this node since it's new.
*/
-function tracker_node_insert(Node $node, $arg = 0) {
+function tracker_node_insert($node, $arg = 0) {
_tracker_add($node->nid, $node->uid, $node->changed);
}
@@ -201,7 +199,7 @@ function tracker_node_insert(Node $node, $arg = 0) {
*
* Adds tracking information for this node since it's been updated.
*/
-function tracker_node_update(Node $node, $arg = 0) {
+function tracker_node_update($node, $arg = 0) {
_tracker_add($node->nid, $node->uid, $node->changed);
}
@@ -210,7 +208,7 @@ function tracker_node_update(Node $node, $arg = 0) {
*
* Deletes tracking information for a node.
*/
-function tracker_node_predelete(Node $node, $arg = 0) {
+function tracker_node_predelete($node, $arg = 0) {
db_delete('tracker_node')
->condition('nid', $node->nid)
->execute();
diff --git a/core/modules/tracker/tracker.test b/core/modules/tracker/tracker.test
new file mode 100644
index 0000000..c6d4a29
--- /dev/null
+++ b/core/modules/tracker/tracker.test
@@ -0,0 +1,270 @@
+ 'Tracker',
+ 'description' => 'Create and delete nodes and check for their display in the tracker listings.',
+ 'group' => 'Tracker'
+ );
+ }
+
+ function setUp() {
+ parent::setUp('comment', 'tracker');
+
+ $this->drupalCreateContentType(array('type' => 'page', 'name' => 'Basic page'));
+
+ $permissions = array('access comments', 'create page content', 'post comments', 'skip comment approval');
+ $this->user = $this->drupalCreateUser($permissions);
+ $this->other_user = $this->drupalCreateUser($permissions);
+
+ // Make node preview optional.
+ variable_set('comment_preview_page', 0);
+ }
+
+ /**
+ * Tests for the presence of nodes on the global tracker listing.
+ */
+ function testTrackerAll() {
+ $this->drupalLogin($this->user);
+
+ $unpublished = $this->drupalCreateNode(array(
+ 'title' => $this->randomName(8),
+ 'status' => 0,
+ ));
+ $published = $this->drupalCreateNode(array(
+ 'title' => $this->randomName(8),
+ 'status' => 1,
+ ));
+
+ $this->drupalGet('tracker');
+ $this->assertNoText($unpublished->title, t('Unpublished node do not show up in the tracker listing.'));
+ $this->assertText($published->title, t('Published node show up in the tracker listing.'));
+ $this->assertLink(t('My recent content'), 0, t('User tab shows up on the global tracker page.'));
+
+ // Delete a node and ensure it no longer appears on the tracker.
+ node_delete($published->nid);
+ $this->drupalGet('tracker');
+ $this->assertNoText($published->title, t('Deleted node do not show up in the tracker listing.'));
+ }
+
+ /**
+ * Tests for the presence of nodes on a user's tracker listing.
+ */
+ function testTrackerUser() {
+ $this->drupalLogin($this->user);
+
+ $unpublished = $this->drupalCreateNode(array(
+ 'title' => $this->randomName(8),
+ 'uid' => $this->user->uid,
+ 'status' => 0,
+ ));
+ $my_published = $this->drupalCreateNode(array(
+ 'title' => $this->randomName(8),
+ 'uid' => $this->user->uid,
+ 'status' => 1,
+ ));
+ $other_published_no_comment = $this->drupalCreateNode(array(
+ 'title' => $this->randomName(8),
+ 'uid' => $this->other_user->uid,
+ 'status' => 1,
+ ));
+ $other_published_my_comment = $this->drupalCreateNode(array(
+ 'title' => $this->randomName(8),
+ 'uid' => $this->other_user->uid,
+ 'status' => 1,
+ ));
+ $comment = array(
+ 'subject' => $this->randomName(),
+ 'comment_body[' . LANGUAGE_NOT_SPECIFIED . '][0][value]' => $this->randomName(20),
+ );
+ $this->drupalPost('comment/reply/' . $other_published_my_comment->nid, $comment, t('Save'));
+
+ $this->drupalGet('user/' . $this->user->uid . '/track');
+ $this->assertNoText($unpublished->title, t("Unpublished nodes do not show up in the users's tracker listing."));
+ $this->assertText($my_published->title, t("Published nodes show up in the user's tracker listing."));
+ $this->assertNoText($other_published_no_comment->title, t("Other user's nodes do not show up in the user's tracker listing."));
+ $this->assertText($other_published_my_comment->title, t("Nodes that the user has commented on appear in the user's tracker listing."));
+
+ // Verify that unpublished comments are removed from the tracker.
+ $admin_user = $this->drupalCreateUser(array('post comments', 'administer comments', 'access user profiles'));
+ $this->drupalLogin($admin_user);
+ $this->drupalPost('comment/1/edit', array('status' => COMMENT_NOT_PUBLISHED), t('Save'));
+ $this->drupalGet('user/' . $this->user->uid . '/track');
+ $this->assertNoText($other_published_my_comment->title, 'Unpublished comments are not counted on the tracker listing.');
+ }
+
+ /**
+ * Tests for the presence of the "new" flag for nodes.
+ */
+ function testTrackerNewNodes() {
+ $this->drupalLogin($this->user);
+
+ $edit = array(
+ 'title' => $this->randomName(8),
+ );
+
+ $node = $this->drupalCreateNode($edit);
+ $title = $edit['title'];
+ $this->drupalGet('tracker');
+ $this->assertPattern('/' . $title . '.*new/', t('New nodes are flagged as such in the tracker listing.'));
+
+ $this->drupalGet('node/' . $node->nid);
+ $this->drupalGet('tracker');
+ $this->assertNoPattern('/' . $title . '.*new/', t('Visited nodes are not flagged as new.'));
+
+ $this->drupalLogin($this->other_user);
+ $this->drupalGet('tracker');
+ $this->assertPattern('/' . $title . '.*new/', t('For another user, new nodes are flagged as such in the tracker listing.'));
+
+ $this->drupalGet('node/' . $node->nid);
+ $this->drupalGet('tracker');
+ $this->assertNoPattern('/' . $title . '.*new/', t('For another user, visited nodes are not flagged as new.'));
+ }
+
+ /**
+ * Tests for comment counters on the tracker listing.
+ */
+ function testTrackerNewComments() {
+ $this->drupalLogin($this->user);
+
+ $node = $this->drupalCreateNode(array(
+ 'comment' => 2,
+ 'title' => array(LANGUAGE_NOT_SPECIFIED => array(array('value' => $this->randomName(8)))),
+ ));
+
+ // Add a comment to the page.
+ $comment = array(
+ 'subject' => $this->randomName(),
+ 'comment_body[' . LANGUAGE_NOT_SPECIFIED . '][0][value]' => $this->randomName(20),
+ );
+ // The new comment is automatically viewed by the current user.
+ $this->drupalPost('comment/reply/' . $node->nid, $comment, t('Save'));
+
+ $this->drupalLogin($this->other_user);
+ $this->drupalGet('tracker');
+ $this->assertText('1 new', t('New comments are counted on the tracker listing pages.'));
+ $this->drupalGet('node/' . $node->nid);
+
+ // Add another comment as other_user.
+ $comment = array(
+ 'subject' => $this->randomName(),
+ 'comment_body[' . LANGUAGE_NOT_SPECIFIED . '][0][value]' => $this->randomName(20),
+ );
+ // If the comment is posted in the same second as the last one then Drupal
+ // can't tell the difference, so we wait one second here.
+ sleep(1);
+ $this->drupalPost('comment/reply/' . $node->nid, $comment, t('Save'));
+
+ $this->drupalLogin($this->user);
+ $this->drupalGet('tracker');
+ $this->assertText('1 new', t('New comments are counted on the tracker listing pages.'));
+ }
+
+ /**
+ * Tests that existing nodes are indexed by cron.
+ */
+ function testTrackerCronIndexing() {
+ $this->drupalLogin($this->user);
+
+ // Create 3 nodes.
+ $edits = array();
+ $nodes = array();
+ for ($i = 1; $i <= 3; $i++) {
+ $edits[$i] = array(
+ 'comment' => 2,
+ 'title' => $this->randomName(),
+ );
+ $nodes[$i] = $this->drupalCreateNode($edits[$i]);
+ }
+
+ // Add a comment to the last node as other user.
+ $this->drupalLogin($this->other_user);
+ $comment = array(
+ 'subject' => $this->randomName(),
+ 'comment_body[' . LANGUAGE_NOT_SPECIFIED . '][0][value]' => $this->randomName(20),
+ );
+ $this->drupalPost('comment/reply/' . $nodes[3]->nid, $comment, t('Save'));
+
+ // Start indexing backwards from node 3.
+ variable_set('tracker_index_nid', 3);
+
+ // Clear the current tracker tables and rebuild them.
+ db_delete('tracker_node')
+ ->execute();
+ db_delete('tracker_user')
+ ->execute();
+ tracker_cron();
+
+ $this->drupalLogin($this->user);
+
+ // Fetch the user's tracker.
+ $this->drupalGet('tracker/' . $this->user->uid);
+
+ // Assert that all node titles are displayed.
+ foreach ($nodes as $i => $node) {
+ $this->assertText($node->title, t('Node @i is displayed on the tracker listing pages.', array('@i' => $i)));
+ }
+ $this->assertText('1 new', t('New comment is counted on the tracker listing pages.'));
+ $this->assertText('updated', t('Node is listed as updated'));
+
+ // Fetch the site-wide tracker.
+ $this->drupalGet('tracker');
+
+ // Assert that all node titles are displayed.
+ foreach ($nodes as $i => $node) {
+ $this->assertText($node->title, t('Node @i is displayed on the tracker listing pages.', array('@i' => $i)));
+ }
+ $this->assertText('1 new', t('New comment is counted on the tracker listing pages.'));
+ }
+
+ /**
+ * Tests that publish/unpublish works at admin/content/node.
+ */
+ function testTrackerAdminUnpublish() {
+ $admin_user = $this->drupalCreateUser(array('access content overview', 'administer nodes', 'bypass node access'));
+ $this->drupalLogin($admin_user);
+
+ $node = $this->drupalCreateNode(array(
+ 'comment' => 2,
+ 'title' => $this->randomName(),
+ ));
+
+ // Assert that the node is displayed.
+ $this->drupalGet('tracker');
+ $this->assertText($node->title, t('Node is displayed on the tracker listing pages.'));
+
+ // Unpublish the node and ensure that it's no longer displayed.
+ $edit = array(
+ 'operation' => 'unpublish',
+ 'nodes[' . $node->nid . ']' => $node->nid,
+ );
+ $this->drupalPost('admin/content', $edit, t('Update'));
+
+ $this->drupalGet('tracker');
+ $this->assertText(t('No content available.'), t('Node is displayed on the tracker listing pages.'));
+ }
+}
diff --git a/core/modules/translation/tests/translation_test.module b/core/modules/translation/tests/translation_test.module
index 1bd0659..e3bb4b5 100644
--- a/core/modules/translation/tests/translation_test.module
+++ b/core/modules/translation/tests/translation_test.module
@@ -5,20 +5,9 @@
* Mock module for content translation tests.
*/
-use Drupal\node\Node;
-
/**
* Implements hook_node_insert().
*/
-function translation_test_node_insert(Node $node) {
+function translation_test_node_insert($node) {
drupal_write_record('node', $node, 'nid');
}
-
-/**
- * Implements hook_boot().
- */
-function translation_test_boot() {
- // We run the t() function during hook_boot() to make sure it doesn't break
- // the boot process.
- $translation = t("Calling the t() process during @boot.", array('@boot' => 'hook_boot()'));
-}
diff --git a/core/modules/translation/translation.module b/core/modules/translation/translation.module
index b2c0635..fa73df5 100644
--- a/core/modules/translation/translation.module
+++ b/core/modules/translation/translation.module
@@ -19,8 +19,6 @@
* date (0) or needs to be updated (1).
*/
-use Drupal\node\Node;
-
/**
* Identifies a content type which has translation support enabled.
*/
@@ -78,7 +76,7 @@ function translation_menu() {
* of types that have translation enabled.
*
* @param $node
- * A node entity.
+ * A node object.
*
* @return
* TRUE if the translation tab should be displayed, FALSE otherwise.
@@ -138,6 +136,28 @@ function translation_form_node_form_alter(&$form, &$form_state) {
if (translation_supported_type($form['#node']->type)) {
$node = $form['#node'];
+ // Build two lists with the disabled and enabled languages.
+ $languages = language_list();
+ $grouped_languages = array();
+ foreach ($languages as $langcode => $language) {
+ $grouped_languages[(int) $language->enabled][$langcode] = $language;
+ }
+
+ $translator_widget = !empty($grouped_languages[0]) && user_access('translate content');
+ $groups = array(t('Disabled'), t('Enabled'));
+ // Allow translators to enter content in disabled languages. Translators
+ // might need to distinguish between enabled and disabled languages, hence
+ // we divide them in two option groups.
+ if ($translator_widget) {
+ $options = array($groups[1] => array(LANGUAGE_NOT_SPECIFIED => t('- None -')));
+ foreach (array(1, 0) as $status) {
+ $group = $groups[$status];
+ foreach ($grouped_languages[$status] as $langcode => $language) {
+ $options[$group][$langcode] = $language->name;
+ }
+ }
+ $form['langcode']['#options'] = $options;
+ }
if (!empty($node->translation_source)) {
// We are creating a translation. Add values and lock language field.
$form['translation_source'] = array('#type' => 'value', '#value' => $node->translation_source);
@@ -150,7 +170,13 @@ function translation_form_node_form_alter(&$form, &$form_state) {
unset($form['langcode']['#options'][LANGUAGE_NOT_SPECIFIED]);
foreach (translation_node_get_translations($node->tnid) as $langcode => $translation) {
if ($translation->nid != $node->nid) {
- unset($form['langcode']['#options'][$langcode]);
+ if ($translator_widget) {
+ $group = $groups[(int)!isset($disabled_languages[$langcode])];
+ unset($form['langcode']['#options'][$group][$langcode]);
+ }
+ else {
+ unset($form['langcode']['#options'][$langcode]);
+ }
}
}
// Add translation values and workflow options.
@@ -193,11 +219,11 @@ function translation_form_node_form_alter(&$form, &$form_state) {
* translation set. If no language provider is enabled, "fall back" to simple
* links built through the result of translation_node_get_translations().
*/
-function translation_node_view(Node $node, $view_mode) {
+function translation_node_view($node, $view_mode) {
// If the site has no translations or is not multilingual we have no content
// translation links to display.
if (isset($node->tnid) && language_multilingual() && $translations = translation_node_get_translations($node->tnid)) {
- $languages = language_list();
+ $languages = language_list(TRUE);
// There might be a language provider enabled defining custom language
// switch links which need to be taken into account while generating the
@@ -210,7 +236,8 @@ function translation_node_view(Node $node, $view_mode) {
$links = array();
foreach ($translations as $langcode => $translation) {
- // Do not show links to the same node or to unpublished translations.
+ // Do not show links to the same node, to unpublished translations or to
+ // translations in disabled languages.
if ($translation->status && isset($languages[$langcode]) && $langcode != $node->langcode) {
$language = $languages[$langcode];
$key = "translation_$langcode";
@@ -248,7 +275,7 @@ function translation_node_view(Node $node, $view_mode) {
/**
* Implements hook_node_prepare().
*/
-function translation_node_prepare(Node $node) {
+function translation_node_prepare($node) {
// Only act if we are dealing with a content type supporting translations.
if (translation_supported_type($node->type) &&
// And it's a new node.
@@ -298,7 +325,7 @@ function translation_node_prepare(Node $node) {
/**
* Implements hook_node_insert().
*/
-function translation_node_insert(Node $node) {
+function translation_node_insert($node) {
// Only act if we are dealing with a content type supporting translations.
if (translation_supported_type($node->type)) {
if (!empty($node->translation_source)) {
@@ -333,7 +360,7 @@ function translation_node_insert(Node $node) {
/**
* Implements hook_node_update().
*/
-function translation_node_update(Node $node) {
+function translation_node_update($node) {
// Only act if we are dealing with a content type supporting translations.
if (translation_supported_type($node->type)) {
if (isset($node->translation) && $node->translation && !empty($node->langcode) && $node->tnid) {
@@ -362,7 +389,7 @@ function translation_node_update(Node $node) {
*
* Ensures that duplicate translations can't be created for the same source.
*/
-function translation_node_validate(Node $node, $form) {
+function translation_node_validate($node, $form) {
// Only act on translatable nodes with a tnid or translation_source.
if (translation_supported_type($node->type) && (!empty($node->tnid) || !empty($form['#node']->translation_source->nid))) {
$tnid = !empty($node->tnid) ? $node->tnid : $form['#node']->translation_source->nid;
@@ -376,7 +403,7 @@ function translation_node_validate(Node $node, $form) {
/**
* Implements hook_node_predelete().
*/
-function translation_node_predelete(Node $node) {
+function translation_node_predelete($node) {
// Only act if we are dealing with a content type supporting translations.
if (translation_supported_type($node->type)) {
translation_remove_from_set($node);
@@ -387,7 +414,7 @@ function translation_node_predelete(Node $node) {
* Removes a node from its translation set and updates accordingly.
*
* @param $node
- * A node entity.
+ * A node object.
*/
function translation_remove_from_set($node) {
if (isset($node->tnid)) {
diff --git a/core/modules/translation/translation.pages.inc b/core/modules/translation/translation.pages.inc
index d85b5e2..66dfc42 100644
--- a/core/modules/translation/translation.pages.inc
+++ b/core/modules/translation/translation.pages.inc
@@ -5,20 +5,18 @@
* User page callbacks for the Translation module.
*/
-use Drupal\node\Node;
-
/**
* Page callback: Displays a list of a node's translations.
*
- * @param Drupal\node\Node $node
- * A node entity.
+ * @param $node
+ * A node object.
*
* @return
* A render array for a page containing a list of content.
*
* @see translation_menu()
*/
-function translation_node_overview(Node $node) {
+function translation_node_overview($node) {
include_once DRUPAL_ROOT . '/core/includes/language.inc';
if ($node->tnid) {
diff --git a/core/modules/translation/translation.test b/core/modules/translation/translation.test
index 15a324e..c0e158c 100644
--- a/core/modules/translation/translation.test
+++ b/core/modules/translation/translation.test
@@ -5,8 +5,6 @@
* Tests for the Translation module.
*/
-use Drupal\node\Node;
-
/**
* Functional tests for the Translation module.
*/
@@ -35,6 +33,11 @@ class TranslationTestCase extends DrupalWebTestCase {
// Add languages.
$this->addLanguage('en');
$this->addLanguage('es');
+ $this->addLanguage('it');
+
+ // Disable Italian to test the translation behavior with disabled languages.
+ $edit = array('languages[it][enabled]' => FALSE);
+ $this->drupalPost('admin/config/regional/language', $edit, t('Save configuration'));
// Set "Basic page" content type to use multilingual support with
// translation.
@@ -123,6 +126,13 @@ class TranslationTestCase extends DrupalWebTestCase {
$this->drupalPost('node/' . $node_translation->nid . '/edit', $edit, t('Save'));
$this->assertRaw(t('Basic page %title has been updated.', array('%title' => $node_translation_title)), t('Translated node updated.'));
+ // Confirm that disabled languages are an option for translators when
+ // creating nodes.
+ $this->drupalGet('node/add/page');
+ $this->assertFieldByXPath('//select[@name="langcode"]//option', 'it', t('Italian (disabled) is available in language selection.'));
+ $translation_it = $this->createTranslation($node, $this->randomName(), $this->randomName(), 'it');
+ $this->assertRaw($translation_it->body[LANGUAGE_NOT_SPECIFIED][0]['value'], t('Content created in Italian (disabled).'));
+
// Confirm that language neutral is an option for translators when there are
// disabled languages.
$this->drupalGet('node/add/page');
@@ -130,10 +140,11 @@ class TranslationTestCase extends DrupalWebTestCase {
$node2 = $this->createPage($this->randomName(), $this->randomName(), LANGUAGE_NOT_SPECIFIED);
$this->assertRaw($node2->body[LANGUAGE_NOT_SPECIFIED][0]['value'], t('Language neutral content created with disabled languages available.'));
- // Leave just one language installed and check that the translation overview
+ // Leave just one language enabled and check that the translation overview
// page is still accessible.
$this->drupalLogin($this->admin_user);
- $this->drupalPost('admin/config/regional/language/delete/es', array(), t('Delete'));
+ $edit = array('languages[es][enabled]' => FALSE);
+ $this->drupalPost('admin/config/regional/language', $edit, t('Save configuration'));
$this->drupalLogin($this->translator);
$this->drupalGet('node/' . $node->nid . '/translate');
$this->assertRaw(t('Translations of %title', array('%title' => $node->title)), t('Translation overview page available with only one language enabled.'));
@@ -143,14 +154,17 @@ class TranslationTestCase extends DrupalWebTestCase {
* Checks that the language switch links behave properly.
*/
function testLanguageSwitchLinks() {
- // Create a Basic page in English and its translation in Spanish.
+ // Create a Basic page in English and its translations in Spanish and
+ // Italian.
$node = $this->createPage($this->randomName(), $this->randomName(), 'en');
$translation_es = $this->createTranslation($node, $this->randomName(), $this->randomName(), 'es');
+ $translation_it = $this->createTranslation($node, $this->randomName(), $this->randomName(), 'it');
- // Check that language switch links are correctly shown for languages
- // we have translations for.
+ // Check that language switch links are correctly shown only for enabled
+ // languages.
$this->assertLanguageSwitchLinks($node, $translation_es);
$this->assertLanguageSwitchLinks($translation_es, $node);
+ $this->assertLanguageSwitchLinks($node, $translation_it, FALSE);
// Check that links to the displayed translation appear only in the language
// switcher block.
@@ -181,9 +195,10 @@ class TranslationTestCase extends DrupalWebTestCase {
* Tests that the language switcher block alterations work as intended.
*/
function testLanguageSwitcherBlockIntegration() {
- // Add Italian to have three items in the language switcher block.
+ // Enable Italian to have three items in the language switcher block.
$this->drupalLogin($this->admin_user);
- $this->addLanguage('it');
+ $edit = array('languages[it][enabled]' => TRUE);
+ $this->drupalPost('admin/config/regional/language', $edit, t('Save configuration'));
$this->resetCaches();
$this->drupalLogin($this->translator);
@@ -271,7 +286,7 @@ class TranslationTestCase extends DrupalWebTestCase {
// Check to make sure that language has not already been installed.
$this->drupalGet('admin/config/regional/language');
- if (strpos($this->drupalGetContent(), 'languages[' . $language_code . ']') === FALSE) {
+ if (strpos($this->drupalGetContent(), 'languages[' . $language_code . '][enabled]') === FALSE) {
// Doesn't have language installed so add it.
$edit = array();
$edit['predefined_langcode'] = $language_code;
@@ -286,9 +301,15 @@ class TranslationTestCase extends DrupalWebTestCase {
$this->assertRaw(t('The language %language has been created and can now be used.', array('%language' => $languages[$language_code]->name)), t('Language has been created.'));
}
}
+ elseif ($this->xpath('//input[@type="checkbox" and @name=:name and @checked="checked"]', array(':name' => 'languages[' . $language_code . '][enabled]'))) {
+ // It's installed and enabled. No need to do anything.
+ $this->assertTrue(true, 'Language [' . $language_code . '] already installed and enabled.');
+ }
else {
- // It's installed. No need to do anything.
+ // It's installed but not enabled. Enable it.
$this->assertTrue(true, 'Language [' . $language_code . '] already installed.');
+ $this->drupalPost(NULL, array('languages[' . $language_code . '][enabled]' => TRUE), t('Save configuration'));
+ $this->assertRaw(t('Configuration saved.'), t('Language successfully enabled.'));
}
}
@@ -326,7 +347,7 @@ class TranslationTestCase extends DrupalWebTestCase {
/**
* Creates a translation for a basic page in the specified language.
*
- * @param Node $node
+ * @param $node
* The basic page to create the translation for.
* @param $title
* The title of a basic page in the specified language.
@@ -338,7 +359,7 @@ class TranslationTestCase extends DrupalWebTestCase {
* @return
* Translation object.
*/
- function createTranslation(Node $node, $title, $body, $langcode) {
+ function createTranslation($node, $title, $body, $langcode) {
$this->drupalGet('node/add/page', array('query' => array('translation' => $node->nid, 'target' => $langcode)));
$field_langcode = LANGUAGE_NOT_SPECIFIED;
diff --git a/core/modules/update/update.api.php b/core/modules/update/update.api.php
index 5f68f0e..83b93b2 100644
--- a/core/modules/update/update.api.php
+++ b/core/modules/update/update.api.php
@@ -29,11 +29,11 @@
* includes all the metadata documented in the comments below for each
* project (either module or theme) that is currently enabled. The array is
* initially populated inside update_get_projects() with the help of
- * update_process_info_list(), so look there for examples of how to
+ * _update_process_info_list(), so look there for examples of how to
* populate the array with real values.
*
* @see update_get_projects()
- * @see update_process_info_list()
+ * @see _update_process_info_list()
*/
function hook_update_projects_alter(&$projects) {
// Hide a site-specific module from the list.
diff --git a/core/modules/update/update.compare.inc b/core/modules/update/update.compare.inc
index 3b1de48..3338162 100644
--- a/core/modules/update/update.compare.inc
+++ b/core/modules/update/update.compare.inc
@@ -37,11 +37,11 @@ function update_get_projects() {
// Still empty, so we have to rebuild the cache.
$module_data = system_rebuild_module_data();
$theme_data = system_rebuild_theme_data();
- update_process_info_list($projects, $module_data, 'module', TRUE);
- update_process_info_list($projects, $theme_data, 'theme', TRUE);
+ _update_process_info_list($projects, $module_data, 'module', TRUE);
+ _update_process_info_list($projects, $theme_data, 'theme', TRUE);
if (variable_get('update_check_disabled', FALSE)) {
- update_process_info_list($projects, $module_data, 'module', FALSE);
- update_process_info_list($projects, $theme_data, 'theme', FALSE);
+ _update_process_info_list($projects, $module_data, 'module', FALSE);
+ _update_process_info_list($projects, $theme_data, 'theme', FALSE);
}
// Allow other modules to alter projects before fetching and comparing.
drupal_alter('update_projects', $projects);
@@ -75,12 +75,10 @@ function update_get_projects() {
* @param $status
* Boolean that controls what status (enabled or disabled) to process out of
* the $list and add to the $projects array.
- * @param $additional_whitelist
- * Array of additional elements to be collected from the .info file.
*
* @see update_get_projects()
*/
-function update_process_info_list(&$projects, $list, $project_type, $status, $additional_whitelist = array()) {
+function _update_process_info_list(&$projects, $list, $project_type, $status) {
foreach ($list as $file) {
// A disabled base theme of an enabled sub-theme still has all of its code
// run by the sub-theme, so we include it in our "enabled" projects list.
@@ -177,7 +175,7 @@ function update_process_info_list(&$projects, $list, $project_type, $status, $ad
'name' => $project_name,
// Only save attributes from the .info file we care about so we do not
// bloat our RAM usage needlessly.
- 'info' => update_filter_project_info($file->info, $additional_whitelist),
+ 'info' => update_filter_project_info($file->info),
'datestamp' => $file->info['datestamp'],
'includes' => array($file->name => $file->info['name']),
'project_type' => $project_display_type,
@@ -741,7 +739,6 @@ function update_project_cache($cid) {
// On certain paths, we should clear the cache and recompute the projects for
// update status of the site to avoid presenting stale information.
- $q = $_GET['q'];
$paths = array(
'admin/modules',
'admin/modules/update',
@@ -753,7 +750,7 @@ function update_project_cache($cid) {
'admin/reports/status',
'admin/reports/updates/check',
);
- if (in_array($q, $paths)) {
+ if (in_array(current_path(), $paths)) {
_update_cache_clear($cid);
}
else {
@@ -770,15 +767,13 @@ function update_project_cache($cid) {
*
* @param array $info
* Array of .info file data as returned by drupal_parse_info_file().
- * @param $additional_whitelist
- * Array of additional elements to be collected from the .info file.
*
* @return
* Array of .info file data we need for the Update manager.
*
- * @see update_process_info_list()
+ * @see _update_process_info_list()
*/
-function update_filter_project_info($info, $additional_whitelist = array()) {
+function update_filter_project_info($info) {
$whitelist = array(
'_info_file_ctime',
'datestamp',
@@ -789,6 +784,5 @@ function update_filter_project_info($info, $additional_whitelist = array()) {
'project status url',
'version',
);
- $whitelist = array_merge($whitelist, $additional_whitelist);
return array_intersect_key($info, drupal_map_assoc($whitelist));
}
diff --git a/core/modules/update/update.module b/core/modules/update/update.module
index 6142a20..65c431d 100644
--- a/core/modules/update/update.module
+++ b/core/modules/update/update.module
@@ -107,7 +107,7 @@ function update_help($path, $arg) {
*/
function update_init() {
if (arg(0) == 'admin' && user_access('administer site configuration')) {
- switch ($_GET['q']) {
+ switch (current_path()) {
// These pages don't need additional nagging.
case 'admin/appearance/update':
case 'admin/appearance/install':
@@ -809,19 +809,14 @@ function _update_get_cache_multiple($cid_prefix) {
*
* @param $cid
* Optional cache ID of the record to clear from the private update module
- * cache. If empty, all records will be cleared from the table except
- * fetch tasks.
+ * cache. If empty, all records will be cleared from the table.
* @param $wildcard
* If $wildcard is TRUE, cache IDs starting with $cid are deleted in
* addition to the exact cache ID specified by $cid.
*/
function _update_cache_clear($cid = NULL, $wildcard = FALSE) {
if (empty($cid)) {
- db_delete('cache_update')
- // Clear everything except fetch task information because these are used
- // to ensure that the fetch task queue items are not added multiple times.
- ->condition('cid', 'fetch_task::%', 'NOT LIKE')
- ->execute();
+ db_truncate('cache_update')->execute();
}
else {
$query = db_delete('cache_update');
diff --git a/core/modules/update/update.test b/core/modules/update/update.test
index c8cfdd4..f91e41a 100644
--- a/core/modules/update/update.test
+++ b/core/modules/update/update.test
@@ -225,33 +225,6 @@ class UpdateCoreTestCase extends UpdateTestHelper {
$this->assertUniqueText(t('Failed to get available update data for one project.'));
}
- /**
- * Tests that exactly one fetch task per project is created and not more.
- */
- function testFetchTasks() {
- $projecta = array(
- 'name' => 'aaa_update_test',
- );
- $projectb = array(
- 'name' => 'bbb_update_test',
- );
- $queue = queue('update_fetch_tasks');
- $this->assertEqual($queue->numberOfItems(), 0, 'Queue is empty');
- update_create_fetch_task($projecta);
- $this->assertEqual($queue->numberOfItems(), 1, 'Queue contains one item');
- update_create_fetch_task($projectb);
- $this->assertEqual($queue->numberOfItems(), 2, 'Queue contains two items');
- // Try to add project a again.
- update_create_fetch_task($projecta);
- $this->assertEqual($queue->numberOfItems(), 2, 'Queue still contains two items');
-
- // Clear cache and try again.
- _update_cache_clear();
- drupal_static_reset('_update_create_fetch_task');
- update_create_fetch_task($projecta);
- $this->assertEqual($queue->numberOfItems(), 2, 'Queue contains two items');
- }
-
protected function setSystemInfo7_0() {
$setting = array(
'#all' => array(
diff --git a/core/modules/user/lib/Drupal/user/User.php b/core/modules/user/lib/Drupal/user/User.php
deleted file mode 100644
index b39d88d..0000000
--- a/core/modules/user/lib/Drupal/user/User.php
+++ /dev/null
@@ -1,147 +0,0 @@
-uid;
- }
-}
diff --git a/core/modules/user/lib/Drupal/user/UserStorageController.php b/core/modules/user/lib/Drupal/user/UserStorageController.php
deleted file mode 100644
index bd0d9b9..0000000
--- a/core/modules/user/lib/Drupal/user/UserStorageController.php
+++ /dev/null
@@ -1,227 +0,0 @@
- $record) {
- if ($record->picture) {
- $picture_fids[] = $record->picture;
- }
- $queried_users[$key]->data = unserialize($record->data);
- $queried_users[$key]->roles = array();
- if ($record->uid) {
- $queried_users[$record->uid]->roles[DRUPAL_AUTHENTICATED_RID] = 'authenticated user';
- }
- else {
- $queried_users[$record->uid]->roles[DRUPAL_ANONYMOUS_RID] = 'anonymous user';
- }
- }
-
- // Add any additional roles from the database.
- $result = db_query('SELECT r.rid, r.name, ur.uid FROM {role} r INNER JOIN {users_roles} ur ON ur.rid = r.rid WHERE ur.uid IN (:uids)', array(':uids' => array_keys($queried_users)));
- foreach ($result as $record) {
- $queried_users[$record->uid]->roles[$record->rid] = $record->name;
- }
-
- // Add the full file objects for user pictures if enabled.
- if (!empty($picture_fids) && variable_get('user_pictures', 1) == 1) {
- $pictures = file_load_multiple($picture_fids);
- foreach ($queried_users as $entity) {
- if (!empty($entity->picture) && isset($pictures[$entity->picture])) {
- $entity->picture = $pictures[$entity->picture];
- }
- }
- }
- // Call the default attachLoad() method. This will add fields and call
- // hook_user_load().
- parent::attachLoad($queried_users, $revision_id);
- }
-
- /**
- * Overrides EntityDatabaseStorageController::create().
- */
- public function create(array $values) {
- if (!isset($values['created'])) {
- $values['created'] = REQUEST_TIME;
- }
- // Users always have the authenticated user role.
- $values['roles'][DRUPAL_AUTHENTICATED_RID] = 'authenticated user';
-
- return parent::create($values);
- }
-
- /**
- * Overrides EntityDatabaseStorageController::save().
- */
- public function save(EntityInterface $entity) {
- if (empty($entity->uid)) {
- $entity->uid = db_next_id(db_query('SELECT MAX(uid) FROM {users}')->fetchField());
- $entity->enforceIsNew();
- }
- parent::save($entity);
- }
-
- /**
- * Overrides EntityDatabaseStorageController::preSave().
- */
- protected function preSave(EntityInterface $entity) {
- // Update the user password if it has changed.
- if ($entity->isNew() || (!empty($entity->pass) && $entity->pass != $entity->original->pass)) {
- // Allow alternate password hashing schemes.
- require_once DRUPAL_ROOT . '/' . variable_get('password_inc', 'core/includes/password.inc');
- $entity->pass = user_hash_password(trim($entity->pass));
- // Abort if the hashing failed and returned FALSE.
- if (!$entity->pass) {
- throw new EntityMalformedException('The entity does not have a password.');
- }
- }
-
- if (!empty($entity->picture_upload)) {
- $entity->picture = $entity->picture_upload;
- }
- // Delete the picture if the submission indicates that it should be deleted
- // and no replacement was submitted.
- elseif (!empty($entity->picture_delete)) {
- $entity->picture = 0;
- file_usage_delete($entity->original->picture, 'user', 'user', $entity->uid);
- file_delete($entity->original->picture);
- }
-
- if (!$entity->isNew()) {
- // Process picture uploads.
- if (!empty($entity->picture->fid) && (!isset($entity->original->picture->fid) || $entity->picture->fid != $entity->original->picture->fid)) {
- $picture = $entity->picture;
- // If the picture is a temporary file, move it to its final location
- // and make it permanent.
- if (!$picture->status) {
- $info = image_get_info($picture->uri);
- $picture_directory = file_default_scheme() . '://' . variable_get('user_picture_path', 'pictures');
-
- // Prepare the pictures directory.
- file_prepare_directory($picture_directory, FILE_CREATE_DIRECTORY);
- $destination = file_stream_wrapper_uri_normalize($picture_directory . '/picture-' . $entity->uid . '-' . REQUEST_TIME . '.' . $info['extension']);
-
- // Move the temporary file into the final location.
- if ($picture = file_move($picture, $destination, FILE_EXISTS_RENAME)) {
- $picture->status = FILE_STATUS_PERMANENT;
- $entity->picture = file_save($picture);
- file_usage_add($picture, 'user', 'user', $entity->uid);
- }
- }
- // Delete the previous picture if it was deleted or replaced.
- if (!empty($entity->original->picture->fid)) {
- file_usage_delete($entity->original->picture, 'user', 'user', $entity->uid);
- file_delete($entity->original->picture);
- }
- }
- $entity->picture = empty($entity->picture->fid) ? 0 : $entity->picture->fid;
-
- // If the password is empty, that means it was not changed, so use the
- // original password.
- if (empty($entity->pass)) {
- $entity->pass = $entity->original->pass;
- }
- }
-
- // Prepare user roles.
- if (isset($entity->roles)) {
- $entity->roles = array_filter($entity->roles);
- }
-
- // Move account cancellation information into $entity->data.
- foreach (array('user_cancel_method', 'user_cancel_notify') as $key) {
- if (isset($entity->{$key})) {
- $entity->data[$key] = $entity->{$key};
- }
- }
- }
-
- /**
- * Overrides EntityDatabaseStorageController::postSave().
- */
- protected function postSave(EntityInterface $entity, $update) {
-
- if ($update) {
- // If the password has been changed, delete all open sessions for the
- // user and recreate the current one.
- if ($entity->pass != $entity->original->pass) {
- drupal_session_destroy_uid($entity->uid);
- if ($entity->uid == $GLOBALS['user']->uid) {
- drupal_session_regenerate();
- }
- }
-
- // Remove roles that are no longer enabled for the user.
- $entity->roles = array_filter($entity->roles);
-
- // Reload user roles if provided.
- if ($entity->roles != $entity->original->roles) {
- db_delete('users_roles')
- ->condition('uid', $entity->uid)
- ->execute();
-
- $query = db_insert('users_roles')->fields(array('uid', 'rid'));
- foreach (array_keys($entity->roles) as $rid) {
- if (!in_array($rid, array(DRUPAL_ANONYMOUS_RID, DRUPAL_AUTHENTICATED_RID))) {
- $query->values(array(
- 'uid' => $entity->uid,
- 'rid' => $rid,
- ));
- }
- }
- $query->execute();
- }
-
- // If the user was blocked, delete the user's sessions to force a logout.
- if ($entity->original->status != $entity->status && $entity->status == 0) {
- drupal_session_destroy_uid($entity->uid);
- }
-
- // Send emails after we have the new user object.
- if ($entity->status != $entity->original->status) {
- // The user's status is changing; conditionally send notification email.
- $op = $entity->status == 1 ? 'status_activated' : 'status_blocked';
- _user_mail_notify($op, $entity);
- }
- }
- else {
- // Save user roles.
- if (count($entity->roles) > 1) {
- $query = db_insert('users_roles')->fields(array('uid', 'rid'));
- foreach (array_keys($entity->roles) as $rid) {
- if (!in_array($rid, array(DRUPAL_ANONYMOUS_RID, DRUPAL_AUTHENTICATED_RID))) {
- $query->values(array(
- 'uid' => $entity->uid,
- 'rid' => $rid,
- ));
- }
- }
- $query->execute();
- }
- }
- }
-}
diff --git a/core/modules/user/user.api.php b/core/modules/user/user.api.php
index 1b8a253..dc16906 100644
--- a/core/modules/user/user.api.php
+++ b/core/modules/user/user.api.php
@@ -227,57 +227,67 @@ function hook_user_operations() {
}
/**
- * Act on a user account being inserted or updated.
+ * A user account is about to be created or updated.
*
- * This hook is invoked before the user account is saved to the database.
- *
- * Modules that want to store properties in the serialized {users}.data column,
- * which is automatically loaded whenever a user account object is loaded, may
- * add their properties to $account->data in order to have their data serialized
- * on save.
+ * This hook is primarily intended for modules that want to store properties in
+ * the serialized {users}.data column, which is automatically loaded whenever a
+ * user account object is loaded, modules may add to $edit['data'] in order
+ * to have their data serialized on save.
*
+ * @param $edit
+ * The array of form values submitted by the user.
* @param $account
- * The user account object.
+ * The user object on which the operation is performed.
*
* @see hook_user_insert()
* @see hook_user_update()
*/
-function hook_user_presave($account) {
+function hook_user_presave(&$edit, $account) {
// Make sure that our form value 'mymodule_foo' is stored as
// 'mymodule_bar' in the 'data' (serialized) column.
- if (isset($account->mymodule_foo)) {
- $account->data['mymodule_bar'] = $account->mymodule_foo;
+ if (isset($edit['mymodule_foo'])) {
+ $edit['data']['mymodule_bar'] = $edit['mymodule_foo'];
}
}
/**
- * Respond to creation of a new user account.
+ * A user account was created.
*
+ * The module should save its custom additions to the user object into the
+ * database.
+ *
+ * @param $edit
+ * The array of form values submitted by the user.
* @param $account
- * The user account object.
+ * The user object on which the operation is being performed.
*
* @see hook_user_presave()
* @see hook_user_update()
*/
-function hook_user_insert($account) {
- db_insert('user_changes')
+function hook_user_insert(&$edit, $account) {
+ db_insert('mytable')
->fields(array(
+ 'myfield' => $edit['myfield'],
'uid' => $account->uid,
- 'created' => time(),
))
->execute();
}
/**
- * Respond to updates to a user account.
+ * A user account was updated.
+ *
+ * Modules may use this hook to update their user data in a custom storage
+ * after a user account has been updated.
*
+ * @param $edit
+ * The array of form values submitted by the user.
* @param $account
- * The user account object.
+ * The user object on which the operation is performed.
*
* @see hook_user_presave()
* @see hook_user_insert()
*/
-function hook_user_update($account) {
+function hook_user_update(&$edit, $account) {
db_insert('user_changes')
->fields(array(
'uid' => $account->uid,
diff --git a/core/modules/user/user.entity.inc b/core/modules/user/user.entity.inc
new file mode 100644
index 0000000..5549c77
--- /dev/null
+++ b/core/modules/user/user.entity.inc
@@ -0,0 +1,52 @@
+ $record) {
+ $picture_fids[] = $record->picture;
+ $queried_users[$key]->data = unserialize($record->data);
+ $queried_users[$key]->roles = array();
+ if ($record->uid) {
+ $queried_users[$record->uid]->roles[DRUPAL_AUTHENTICATED_RID] = 'authenticated user';
+ }
+ else {
+ $queried_users[$record->uid]->roles[DRUPAL_ANONYMOUS_RID] = 'anonymous user';
+ }
+ }
+
+ // Add any additional roles from the database.
+ $result = db_query('SELECT r.rid, r.name, ur.uid FROM {role} r INNER JOIN {users_roles} ur ON ur.rid = r.rid WHERE ur.uid IN (:uids)', array(':uids' => array_keys($queried_users)));
+ foreach ($result as $record) {
+ $queried_users[$record->uid]->roles[$record->rid] = $record->name;
+ }
+
+ // Add the full file objects for user pictures if enabled.
+ if (!empty($picture_fids) && variable_get('user_pictures', 1) == 1) {
+ $pictures = file_load_multiple($picture_fids);
+ foreach ($queried_users as $account) {
+ if (!empty($account->picture) && isset($pictures[$account->picture])) {
+ $account->picture = $pictures[$account->picture];
+ }
+ else {
+ $account->picture = NULL;
+ }
+ }
+ }
+ // Call the default attachLoad() method. This will add fields and call
+ // hook_user_load().
+ parent::attachLoad($queried_users, $revision_id);
+ }
+}
diff --git a/core/modules/user/user.info b/core/modules/user/user.info
index 8dad5a3..d887352 100644
--- a/core/modules/user/user.info
+++ b/core/modules/user/user.info
@@ -3,6 +3,7 @@ description = Manages the user registration and login system.
package = Core
version = VERSION
core = 8.x
+files[] = user.entity.inc
files[] = user.test
required = TRUE
configure = admin/config/people
diff --git a/core/modules/user/user.module b/core/modules/user/user.module
index e6fa2dd..c8daa48 100644
--- a/core/modules/user/user.module
+++ b/core/modules/user/user.module
@@ -83,8 +83,12 @@ function user_help($path, $arg) {
* be passed by reference.
*
* @param $type
- * A text string that controls which user hook to invoke. Valid choices are:
+ * A text string that controls which user hook to invoke. Valid choices are:
+ * - cancel: Invokes hook_user_cancel().
+ * - insert: Invokes hook_user_insert().
* - login: Invokes hook_user_login().
+ * - presave: Invokes hook_user_presave().
+ * - update: Invokes hook_user_update().
* @param $edit
* An associative array variable containing form values to be passed
* as the first parameter of the hook function.
@@ -141,15 +145,14 @@ function user_theme() {
* Implements hook_entity_info().
*/
function user_entity_info() {
- return array(
+ $return = array(
'user' => array(
'label' => t('User'),
- 'controller class' => 'Drupal\user\UserStorageController',
+ 'controller class' => 'UserController',
'base table' => 'users',
'uri callback' => 'user_uri',
'label callback' => 'user_label',
'fieldable' => TRUE,
- 'entity class' => 'Drupal\user\User',
'entity keys' => array(
'id' => 'uid',
),
@@ -170,6 +173,7 @@ function user_entity_info() {
),
),
);
+ return $return;
}
/**
@@ -261,28 +265,28 @@ function user_external_load($authname) {
}
/**
- * Loads multiple users based on certain conditions.
+ * Load multiple users based on certain conditions.
*
* This function should be used whenever you need to load more than one user
* from the database. Users are loaded into memory and will not require
* database access if loaded again during the same page request.
*
- * @param array|bool $uids
- * An array of user IDs, or FALSE to load all users.
- * @param array $conditions
+ * @param $uids
+ * An array of user IDs.
+ * @param $conditions
* (deprecated) An associative array of conditions on the {users}
* table, where the keys are the database fields and the values are the
* values those fields must have. Instead, it is preferable to use
* EntityFieldQuery to retrieve a list of entity IDs loadable by
* this function.
- * @param bool $reset
+ * @param $reset
* A boolean indicating that the internal cache should be reset. Use this if
* loading a user object which has been altered during the page request.
*
- * @return array
+ * @return
* An array of user objects, indexed by uid.
*
- * @see entity_load_multiple()
+ * @see entity_load()
* @see user_load()
* @see user_load_by_mail()
* @see user_load_by_name()
@@ -290,8 +294,8 @@ function user_external_load($authname) {
*
* @todo Remove $conditions in Drupal 8.
*/
-function user_load_multiple($uids = array(), array $conditions = array(), $reset = FALSE) {
- return entity_load_multiple('user', $uids, $conditions, $reset);
+function user_load_multiple($uids = array(), $conditions = array(), $reset = FALSE) {
+ return entity_load('user', $uids, $conditions, $reset);
}
/**
@@ -306,55 +310,274 @@ function user_load_multiple($uids = array(), array $conditions = array(), $reset
* @link http://drupal.org/node/218104 Safely impersonating another user @endlink
* for more information.
*
- * @param int $uid
+ * @param $uid
* Integer specifying the user ID to load.
- * @param bool $reset
+ * @param $reset
* TRUE to reset the internal cache and load from the database; FALSE
* (default) to load from the internal cache, if set.
*
- * @return object
+ * @return
* A fully-loaded user object upon successful user load, or FALSE if the user
* cannot be loaded.
*
* @see user_load_multiple()
*/
function user_load($uid, $reset = FALSE) {
- return entity_load('user', $uid, $reset);
+ $users = user_load_multiple(array($uid), array(), $reset);
+ return reset($users);
}
/**
- * Fetches a user object by email address.
+ * Fetch a user object by email address.
*
- * @param string $mail
+ * @param $mail
* String with the account's e-mail address.
- * @return object|bool
+ * @return
* A fully-loaded $user object upon successful user load or FALSE if user
* cannot be loaded.
*
* @see user_load_multiple()
*/
function user_load_by_mail($mail) {
- $users = entity_load_multiple('user', FALSE, array('mail' => $mail));
+ $users = user_load_multiple(array(), array('mail' => $mail));
return reset($users);
}
/**
- * Fetches a user object by account name.
+ * Fetch a user object by account name.
*
- * @param string $name
+ * @param $name
* String with the account's user name.
- * @return object|bool
+ * @return
* A fully-loaded $user object upon successful user load or FALSE if user
* cannot be loaded.
*
* @see user_load_multiple()
*/
function user_load_by_name($name) {
- $users = entity_load_multiple('user', FALSE, array('name' => $name));
+ $users = user_load_multiple(array(), array('name' => $name));
return reset($users);
}
/**
+ * Save changes to a user account or add a new user.
+ *
+ * @param $account
+ * (optional) The user object to modify or add. If you want to modify
+ * an existing user account, you will need to ensure that (a) $account
+ * is an object, and (b) you have set $account->uid to the numeric
+ * user ID of the user account you wish to modify. If you
+ * want to create a new user account, you can set $account->is_new to
+ * TRUE or omit the $account->uid field.
+ * @param $edit
+ * An array of fields and values to save. For example array('name'
+ * => 'My name'). Key / value pairs added to the $edit['data'] will be
+ * serialized and saved in the {users.data} column.
+ *
+ * @return
+ * A fully-loaded $user object upon successful save or FALSE if the save failed.
+ *
+ * @todo D8: Drop $edit and fix user_save() to be consistent with others.
+ */
+function user_save($account, $edit = array()) {
+ $transaction = db_transaction();
+ try {
+ if (!empty($edit['pass'])) {
+ // Allow alternate password hashing schemes.
+ require_once DRUPAL_ROOT . '/' . variable_get('password_inc', 'core/includes/password.inc');
+ $edit['pass'] = user_hash_password(trim($edit['pass']));
+ // Abort if the hashing failed and returned FALSE.
+ if (!$edit['pass']) {
+ return FALSE;
+ }
+ }
+ else {
+ // Avoid overwriting an existing password with a blank password.
+ unset($edit['pass']);
+ }
+
+ // Load the stored entity, if any.
+ if (!empty($account->uid) && !isset($account->original)) {
+ $account->original = entity_load_unchanged('user', $account->uid);
+ }
+
+ if (empty($account)) {
+ $account = new stdClass();
+ }
+ if (!isset($account->is_new)) {
+ $account->is_new = empty($account->uid);
+ }
+ // Prepopulate $edit['data'] with the current value of $account->data.
+ // Modules can add to or remove from this array in hook_user_presave().
+ if (!empty($account->data)) {
+ $edit['data'] = !empty($edit['data']) ? array_merge($account->data, $edit['data']) : $account->data;
+ }
+
+ // Invoke hook_user_presave() for all modules.
+ user_module_invoke('presave', $edit, $account);
+
+ // Invoke presave operations of Field Attach API and Entity API. Those APIs
+ // require a fully-fledged and updated entity object. Therefore, we need to
+ // copy any new property values of $edit into it.
+ foreach ($edit as $key => $value) {
+ $account->$key = $value;
+ }
+ // Default the user entity language to the user's preferred language.
+ if (!isset($account->langcode) && isset($account->preferred_langcode)) {
+ $account->langcode = $account->preferred_langcode;
+ }
+ field_attach_presave('user', $account);
+ module_invoke_all('entity_presave', $account, 'user');
+
+ if (is_object($account) && !$account->is_new) {
+ // Process picture uploads.
+ if (!empty($account->picture->fid) && (!isset($account->original->picture->fid) || $account->picture->fid != $account->original->picture->fid)) {
+ $picture = $account->picture;
+ // If the picture is a temporary file move it to its final location and
+ // make it permanent.
+ if (!$picture->status) {
+ $info = image_get_info($picture->uri);
+ $picture_directory = file_default_scheme() . '://' . variable_get('user_picture_path', 'pictures');
+
+ // Prepare the pictures directory.
+ file_prepare_directory($picture_directory, FILE_CREATE_DIRECTORY);
+ $destination = file_stream_wrapper_uri_normalize($picture_directory . '/picture-' . $account->uid . '-' . REQUEST_TIME . '.' . $info['extension']);
+
+ // Move the temporary file into the final location.
+ if ($picture = file_move($picture, $destination, FILE_EXISTS_RENAME)) {
+ $picture->status = FILE_STATUS_PERMANENT;
+ $account->picture = file_save($picture);
+ file_usage_add($picture, 'user', 'user', $account->uid);
+ }
+ }
+ // Delete the previous picture if it was deleted or replaced.
+ if (!empty($account->original->picture->fid)) {
+ file_usage_delete($account->original->picture, 'user', 'user', $account->uid);
+ file_delete($account->original->picture);
+ }
+ }
+ elseif (isset($edit['picture_delete']) && $edit['picture_delete']) {
+ file_usage_delete($account->original->picture, 'user', 'user', $account->uid);
+ file_delete($account->original->picture);
+ }
+ $account->picture = empty($account->picture->fid) ? 0 : $account->picture->fid;
+
+ // Do not allow 'uid' to be changed.
+ $account->uid = $account->original->uid;
+ // Save changes to the user table.
+ $success = drupal_write_record('users', $account, 'uid');
+ if ($success === FALSE) {
+ // The query failed - better to abort the save than risk further
+ // data loss.
+ return FALSE;
+ }
+
+ // Reload user roles if provided.
+ if ($account->roles != $account->original->roles) {
+ db_delete('users_roles')
+ ->condition('uid', $account->uid)
+ ->execute();
+
+ $query = db_insert('users_roles')->fields(array('uid', 'rid'));
+ foreach (array_keys($account->roles) as $rid) {
+ if (!in_array($rid, array(DRUPAL_ANONYMOUS_RID, DRUPAL_AUTHENTICATED_RID))) {
+ $query->values(array(
+ 'uid' => $account->uid,
+ 'rid' => $rid,
+ ));
+ }
+ }
+ $query->execute();
+ }
+
+ // Delete a blocked user's sessions to kick them if they are online.
+ if ($account->original->status != $account->status && $account->status == 0) {
+ drupal_session_destroy_uid($account->uid);
+ }
+
+ // If the password changed, delete all open sessions and recreate
+ // the current one.
+ if ($account->pass != $account->original->pass) {
+ drupal_session_destroy_uid($account->uid);
+ if ($account->uid == $GLOBALS['user']->uid) {
+ drupal_session_regenerate();
+ }
+ }
+
+ // Save Field data.
+ field_attach_update('user', $account);
+
+ // Send emails after we have the new user object.
+ if ($account->status != $account->original->status) {
+ // The user's status is changing; conditionally send notification email.
+ $op = $account->status == 1 ? 'status_activated' : 'status_blocked';
+ _user_mail_notify($op, $account);
+ }
+
+ // Update $edit with any interim changes to $account.
+ foreach ($account as $key => $value) {
+ if (!property_exists($account->original, $key) || $value !== $account->original->$key) {
+ $edit[$key] = $value;
+ }
+ }
+ user_module_invoke('update', $edit, $account);
+ module_invoke_all('entity_update', $account, 'user');
+ }
+ else {
+ // Allow 'uid' to be set by the caller. There is no danger of writing an
+ // existing user as drupal_write_record will do an INSERT.
+ if (empty($account->uid)) {
+ $account->uid = db_next_id(db_query('SELECT MAX(uid) FROM {users}')->fetchField());
+ }
+ // Allow 'created' to be set by the caller.
+ if (!isset($account->created)) {
+ $account->created = REQUEST_TIME;
+ }
+ $success = drupal_write_record('users', $account);
+ if ($success === FALSE) {
+ // On a failed INSERT some other existing user's uid may be returned.
+ // We must abort to avoid overwriting their account.
+ return FALSE;
+ }
+
+ // Make sure $account is properly initialized.
+ $account->roles[DRUPAL_AUTHENTICATED_RID] = 'authenticated user';
+
+ field_attach_insert('user', $account);
+ $edit = (array) $account;
+ user_module_invoke('insert', $edit, $account);
+ module_invoke_all('entity_insert', $account, 'user');
+
+ // Save user roles.
+ if (count($account->roles) > 1) {
+ $query = db_insert('users_roles')->fields(array('uid', 'rid'));
+ foreach (array_keys($account->roles) as $rid) {
+ if (!in_array($rid, array(DRUPAL_ANONYMOUS_RID, DRUPAL_AUTHENTICATED_RID))) {
+ $query->values(array(
+ 'uid' => $account->uid,
+ 'rid' => $rid,
+ ));
+ }
+ }
+ $query->execute();
+ }
+ }
+ // Clear internal properties.
+ unset($account->is_new);
+ unset($account->original);
+ // Clear the static loading cache.
+ entity_get_controller('user')->resetCache(array($account->uid));
+
+ return $account;
+ }
+ catch (Exception $e) {
+ $transaction->rollback();
+ watchdog_exception('user', $e);
+ throw $e;
+ }
+}
+
+/**
* Verify the syntax of the given name.
*/
function user_validate_name($name) {
@@ -697,7 +920,7 @@ function user_user_view($account) {
* @see user_validate_mail()
*/
function user_account_form(&$form, &$form_state) {
- global $user, $language_interface;
+ global $user;
$account = $form['#user'];
$register = ($form['#user']->uid > 0 ? FALSE : TRUE);
@@ -718,7 +941,7 @@ function user_account_form(&$form, &$form_state) {
'#maxlength' => USERNAME_MAX_LENGTH,
'#description' => t('Spaces are allowed; punctuation is not allowed except for periods, hyphens, apostrophes, and underscores.'),
'#required' => TRUE,
- '#attributes' => array('class' => array('username'), 'autocomplete' => 'off'),
+ '#attributes' => array('class' => array('username')),
'#default_value' => (!$register ? $account->name : ''),
'#access' => ($register || ($user->uid == $account->uid && user_access('change own username')) || $admin),
'#weight' => -10,
@@ -733,7 +956,6 @@ function user_account_form(&$form, &$form_state) {
'#description' => t('A valid e-mail address. All e-mails from the system will be sent to this address. The e-mail address is not made public and will only be used if you wish to receive a new password or wish to receive certain news or notifications by e-mail.'),
'#required' => !(empty($account->mail) && user_access('administer users')),
'#default_value' => (!$register ? $account->mail : ''),
- '#attributes' => array('autocomplete' => 'off'),
);
// Display password field only for existing users or when user is allowed to
@@ -869,69 +1091,6 @@ function user_account_form(&$form, &$form_state) {
'#description' => t('Your virtual face or picture. Pictures larger than @dimensions pixels will be scaled down.', array('@dimensions' => variable_get('user_picture_dimensions', '85x85'))) . ' ' . filter_xss_admin(variable_get('user_picture_guidelines', '')),
);
$form['#validate'][] = 'user_validate_picture';
-
- if (module_exists('language') && language_multilingual()) {
- $languages = language_list();
-
- // If the user is being created, we set the user language to the page language.
- $user_preferred_language = $register ? $language_interface : user_preferred_language($account);
-
- $names = array();
- foreach ($languages as $langcode => $item) {
- $names[$langcode] = $item->name;
- }
- // Is default the interface language?
- $interface_language_is_default = language_negotiation_method_get_first(LANGUAGE_TYPE_INTERFACE) != LANGUAGE_NEGOTIATION_DEFAULT;
- $form['language'] = array(
- '#type' => 'fieldset',
- '#title' => t('Language settings'),
- // Display language selector when either creating a user on the admin
- // interface or editing a user account.
- '#access' => !$register || user_access('administer users'),
- );
- $form['language']['preferred_langcode'] = array(
- '#type' => (count($names) <= 5 ? 'radios' : 'select'),
- '#title' => t('Language'),
- '#default_value' => $user_preferred_language->langcode,
- '#options' => $names,
- '#description' => $interface_language_is_default ? t("This account's preferred language for e-mails and site presentation.") : t("This account's preferred language for e-mails."),
- );
- }
- else {
- $form['language'] = array(
- '#type' => 'container',
- );
- $form['language']['preferred_langcode'] = array(
- '#type' => 'value',
- '#value' => language_default()->langcode,
- );
- }
-
- // User entities contain both a langcode property (for identifying the
- // language of the entity data) and a preferred_langcode property (see above).
- // Rather than provide a UI forcing the user to choose both separately,
- // assume that the user profile data is in the user's preferred language. This
- // element provides that synchronization. For use-cases where this
- // synchronization is not desired, a module can alter or remove this element.
- $form['language']['langcode'] = array(
- '#type' => 'value',
- '#value_callback' => '_user_language_selector_langcode_value',
- // For the synchronization to work, this element must have a larger weight
- // than the preferred_langcode element. Set a large weight here in case
- // a module alters the weight of the other element.
- '#weight' => 100,
- );
-}
-
-/**
- * Sets the value of the user register and profile forms' langcode element.
- */
-function _user_language_selector_langcode_value($element, $input, &$form_state) {
- // Only add to the description if the form element have a description.
- if (isset($form_state['complete_form']['language']['preferred_langcode']['#description'])) {
- $form_state['complete_form']['language']['preferred_langcode']['#description'] .= ' ' . t("This is also assumed to be the primary language of this account's profile information.");
- }
- return $form_state['values']['preferred_langcode'];
}
/**
@@ -970,42 +1129,20 @@ function user_account_form_validate($form, &$form_state) {
if ($error = user_validate_name($form_state['values']['name'])) {
form_set_error('name', $error);
}
- // Cast the user ID as an integer. It might have been set to NULL, which
- // could lead to unexpected results.
- else {
- $name_taken = (bool) db_select('users')
- ->fields('users', array('uid'))
- ->condition('uid', (int) $account->uid, '<>')
- ->condition('name', db_like($form_state['values']['name']), 'LIKE')
- ->range(0, 1)
- ->execute()
- ->fetchField();
-
- if ($name_taken) {
- form_set_error('name', t('The name %name is already taken.', array('%name' => $form_state['values']['name'])));
- }
+ elseif ((bool) db_select('users')->fields('users', array('uid'))->condition('uid', $account->uid, '<>')->condition('name', db_like($form_state['values']['name']), 'LIKE')->range(0, 1)->execute()->fetchField()) {
+ form_set_error('name', t('The name %name is already taken.', array('%name' => $form_state['values']['name'])));
}
}
$mail = $form_state['values']['mail'];
- if (!empty($mail)) {
- $mail_taken = (bool) db_select('users')
- ->fields('users', array('uid'))
- ->condition('uid', (int) $account->uid, '<>')
- ->condition('mail', db_like($mail), 'LIKE')
- ->range(0, 1)
- ->execute()
- ->fetchField();
-
- if ($mail_taken) {
- // Format error message dependent on whether the user is logged in or not.
- if ($GLOBALS['user']->uid) {
- form_set_error('mail', t('The e-mail address %email is already taken.', array('%email' => $mail)));
- }
- else {
- form_set_error('mail', t('The e-mail address %email is already registered. Have you forgotten your password?', array('%email' => $mail, '@password' => url('user/password'))));
- }
+ if (!empty($mail) && (bool) db_select('users')->fields('users', array('uid'))->condition('uid', $account->uid, '<>')->condition('mail', db_like($mail), 'LIKE')->range(0, 1)->execute()->fetchField()) {
+ // Format error message dependent on whether the user is logged in or not.
+ if ($GLOBALS['user']->uid) {
+ form_set_error('mail', t('The e-mail address %email is already taken.', array('%email' => $mail)));
+ }
+ else {
+ form_set_error('mail', t('The e-mail address %email is already registered. Have you forgotten your password?', array('%email' => $mail, '@password' => url('user/password'))));
}
}
@@ -1024,8 +1161,32 @@ function user_account_form_validate($form, &$form_state) {
}
}
+/**
+ * Implements hook_user_presave().
+ */
+function user_user_presave(&$edit, $account) {
+ if (!empty($edit['picture_upload'])) {
+ $edit['picture'] = $edit['picture_upload'];
+ }
+ // Delete picture if requested, and if no replacement picture was given.
+ elseif (!empty($edit['picture_delete'])) {
+ $edit['picture'] = NULL;
+ }
+ // Prepare user roles.
+ if (isset($edit['roles'])) {
+ $edit['roles'] = array_filter($edit['roles']);
+ }
+
+ // Move account cancellation information into $user->data.
+ foreach (array('user_cancel_method', 'user_cancel_notify') as $key) {
+ if (isset($edit[$key])) {
+ $edit['data'][$key] = $edit[$key];
+ }
+ }
+}
+
function user_login_block($form) {
- $form['#action'] = url($_GET['q'], array('query' => drupal_get_destination()));
+ $form['#action'] = url(current_path(), array('query' => drupal_get_destination()));
$form['#id'] = 'user-login-form';
$form['#validate'] = user_login_default_validators();
$form['#submit'][] = 'user_login_submit';
@@ -2023,8 +2184,7 @@ function user_authenticate($name, $password) {
// Update user to new password scheme if needed.
if (user_needs_new_hash($account)) {
- $account->pass = $password;
- $account->save();
+ user_save($account, array('pass' => $password));
}
}
}
@@ -2079,16 +2239,16 @@ function user_external_login_register($name, $module) {
$account = user_external_load($name);
if (!$account) {
// Register this new user.
- $account = entity_create('user', array(
+ $userinfo = array(
'name' => $name,
'pass' => user_password(),
'init' => $name,
'status' => 1,
'access' => REQUEST_TIME
- ));
- $status = $account->save();
- // Terminate if an error occurred while saving the account.
- if ($status != SAVED_NEW) {
+ );
+ $account = user_save(drupal_anonymous_user(), $userinfo);
+ // Terminate if an error occurred during user_save().
+ if (!$account) {
drupal_set_message(t("Error saving user account."), 'error');
return;
}
@@ -2236,8 +2396,7 @@ function _user_cancel($edit, $account, $method) {
if (!empty($edit['user_cancel_notify'])) {
_user_mail_notify('status_blocked', $account);
}
- $account->status = 0;
- $account->save();
+ user_save($account, array('status' => 0));
drupal_set_message(t('%name has been disabled.', array('%name' => $account->name)));
watchdog('user', 'Blocked user: %name %email.', array('%name' => $account->name, '%email' => '<' . $account->mail . '>'), WATCHDOG_NOTICE);
break;
@@ -2325,9 +2484,12 @@ function user_delete_multiple(array $uids) {
* Page callback wrapper for user_view().
*/
function user_view_page($account) {
+ if (is_object($account)) {
+ return user_view($account);
+ }
// An administrator may try to view a non-existent account,
// so we give them a 404 (versus a 403 for non-admins).
- return is_object($account) ? user_view($account) : MENU_NOT_FOUND;
+ drupal_not_found();
}
/**
@@ -2991,8 +3153,7 @@ function user_user_operations_unblock($accounts) {
foreach ($accounts as $account) {
// Skip unblocking user if they are already unblocked.
if ($account !== FALSE && $account->status == 0) {
- $account->status = 1;
- $account->save();
+ user_save($account, array('status' => 1));
}
}
}
@@ -3008,8 +3169,7 @@ function user_user_operations_block($accounts) {
// For efficiency manually save the original account before applying any
// changes.
$account->original = clone $account;
- $account->status = 0;
- $account->save();
+ user_save($account, array('status' => 0));
}
}
}
@@ -3018,6 +3178,8 @@ function user_user_operations_block($accounts) {
* Callback function for admin mass adding/deleting a user role.
*/
function user_multiple_role_edit($accounts, $operation, $rid) {
+ // The role name is not necessary as user_save() will reload the user
+ // object, but some modules' hook_user() may look at this first.
$role_name = db_query('SELECT name FROM {role} WHERE rid = :rid', array(':rid' => $rid))->fetchField();
switch ($operation) {
@@ -3030,8 +3192,7 @@ function user_multiple_role_edit($accounts, $operation, $rid) {
// For efficiency manually save the original account before applying
// any changes.
$account->original = clone $account;
- $account->roles = $roles;
- $account->save();
+ user_save($account, array('roles' => $roles));
}
}
break;
@@ -3044,8 +3205,7 @@ function user_multiple_role_edit($accounts, $operation, $rid) {
// For efficiency manually save the original account before applying
// any changes.
$account->original = clone $account;
- $account->roles = $roles;
- $account->save();
+ user_save($account, array('roles' => $roles));
}
}
break;
@@ -3135,9 +3295,7 @@ function user_multiple_cancel_confirm_submit($form, &$form_state) {
if ($uid == $user->uid) {
$admin_form_state = $form_state;
unset($admin_form_state['values']['user_cancel_confirm']);
- // The $user global is not a complete user entity, so load the full
- // entity.
- $admin_form_state['values']['_account'] = user_load($user->uid);
+ $admin_form_state['values']['_account'] = $user;
user_cancel_confirm_form_submit(array(), $admin_form_state);
}
else {
@@ -3211,7 +3369,7 @@ function user_build_filter_query(SelectInterface $query) {
// the authenticated role. If so, then all users would be listed, and we can
// skip adding it to the filter query.
if ($key == 'permission') {
- $account = entity_create('user', array());
+ $account = new stdClass();
$account->uid = 'user_filter';
$account->roles = array(DRUPAL_AUTHENTICATED_RID => 1);
if (user_access($value, $account)) {
@@ -3457,8 +3615,7 @@ function user_block_user_action(&$entity, $context = array()) {
$uid = $GLOBALS['user']->uid;
}
$account = user_load($uid);
- $account->status = 0;
- $account->save();
+ $account = user_save($account, array('status' => 0));
watchdog('action', 'Blocked user %name.', array('%name' => $account->name));
}
@@ -3537,7 +3694,7 @@ function user_register_form($form, &$form_state) {
drupal_goto('user/' . $user->uid);
}
- $form['#user'] = entity_create('user', array());
+ $form['#user'] = drupal_anonymous_user();
$form['#attached']['library'][] = array('system', 'jquery.cookie');
$form['#attributes']['class'][] = 'user-info-from-cookie';
@@ -3557,7 +3714,7 @@ function user_register_form($form, &$form_state) {
if ($admin) {
// Redirect back to page which initiated the create request;
// usually admin/people/create.
- $form_state['redirect'] = $_GET['q'];
+ $form_state['redirect'] = current_path();
}
$form['actions'] = array('#type' => 'actions');
@@ -3608,10 +3765,14 @@ function user_register_submit($form, &$form_state) {
$account = $form['#user'];
entity_form_submit_build_entity('user', $account, $form, $form_state);
- $status = $account->save();
- // Terminate if an error occurred while saving the account.
- if ($status =! SAVED_NEW) {
+ // Populate $edit with the properties of $account, which have been edited on
+ // this form by taking over all values, which appear in the form values too.
+ $edit = array_intersect_key((array) $account, $form_state['values']);
+ $account = user_save($account, $edit);
+
+ // Terminate if an error occurred during user_save().
+ if (!$account) {
drupal_set_message(t("Error saving user account."), 'error');
$form_state['redirect'] = '';
return;
diff --git a/core/modules/user/user.pages.inc b/core/modules/user/user.pages.inc
index 438fedb..f24849c 100644
--- a/core/modules/user/user.pages.inc
+++ b/core/modules/user/user.pages.inc
@@ -264,8 +264,19 @@ function user_profile_form_submit($form, &$form_state) {
// Remove unneeded values.
form_state_values_clean($form_state);
+ // Before updating the account entity, keep an unchanged copy for use with
+ // user_save() later. This is necessary for modules implementing the user
+ // hooks to be able to react on changes by comparing the values of $account
+ // and $edit.
+ $account_unchanged = clone $account;
+
entity_form_submit_build_entity('user', $account, $form, $form_state);
- $account->save();
+
+ // Populate $edit with the properties of $account, which have been edited on
+ // this form by taking over all values, which appear in the form values too.
+ $edit = array_intersect_key((array) $account, $form_state['values']);
+
+ user_save($account_unchanged, $edit);
$form_state['values']['uid'] = $account->uid;
if (!empty($edit['pass'])) {
@@ -389,9 +400,11 @@ function user_cancel_confirm_form_submit($form, &$form_state) {
else {
// Store cancelling method and whether to notify the user in $account for
// user_cancel_confirm().
- $account->user_cancel_method = $form_state['values']['user_cancel_method'];
- $account->user_cancel_notify = $form_state['values']['user_cancel_notify'];
- $account->save();
+ $edit = array(
+ 'user_cancel_method' => $form_state['values']['user_cancel_method'],
+ 'user_cancel_notify' => $form_state['values']['user_cancel_notify'],
+ );
+ $account = user_save($account, $edit);
_user_mail_notify('cancel_confirm', $account);
drupal_set_message(t('A confirmation request to cancel your account has been sent to your e-mail address.'));
watchdog('user', 'Sent account cancellation request to %name %email.', array('%name' => $account->name, '%email' => '<' . $account->mail . '>'), WATCHDOG_NOTICE);
diff --git a/core/modules/user/user.test b/core/modules/user/user.test
index c911088..bf0e486 100644
--- a/core/modules/user/user.test
+++ b/core/modules/user/user.test
@@ -166,9 +166,9 @@ class UserRegistrationTestCase extends DrupalWebTestCase {
$this->assertTrue(($new_user->created > REQUEST_TIME - 20 ), t('Correct creation time.'));
$this->assertEqual($new_user->status, variable_get('user_register', USER_REGISTER_VISITORS_ADMINISTRATIVE_APPROVAL) == USER_REGISTER_VISITORS ? 1 : 0, t('Correct status field.'));
$this->assertEqual($new_user->timezone, variable_get('date_default_timezone'), t('Correct time zone field.'));
- $this->assertEqual($new_user->langcode, language_default()->langcode, t('Correct language field.'));
- $this->assertEqual($new_user->preferred_langcode, language_default()->langcode, t('Correct preferred language field.'));
- $this->assertEqual($new_user->picture, 0, t('Correct picture field.'));
+ $this->assertEqual($new_user->langcode, '', t('Correct language field.'));
+ $this->assertEqual($new_user->preferred_langcode, '', t('Correct preferred language field.'));
+ $this->assertEqual($new_user->picture, '', t('Correct picture field.'));
$this->assertEqual($new_user->init, $mail, t('Correct init field.'));
}
@@ -553,8 +553,7 @@ class UserCancelTestCase extends DrupalWebTestCase {
'name' => 'user1',
'pass' => user_hash_password(trim($password)),
);
- // We cannot use $account->save() here, because this would result in the
- // password being hashed again.
+ // We cannot use user_save() here or the password would be hashed again.
db_update('users')
->fields($account)
->condition('uid', 1)
@@ -846,8 +845,8 @@ class UserCancelTestCase extends DrupalWebTestCase {
// Create a regular user.
$account = $this->drupalCreateUser(array());
// This user has no e-mail address.
- $account->mail = '';
- $account->save();
+ $edit = array('mail' => '');
+ $account = user_save($account, $edit);
// Create administrative user.
$admin_user = $this->drupalCreateUser(array('administer users'));
@@ -1175,7 +1174,7 @@ class UserPictureTestCase extends DrupalWebTestCase {
// Load actual user data from database.
$account = user_load($this->user->uid, TRUE);
- $pic_path = !empty($account->picture) ? $account->picture->uri : NULL;
+ $pic_path = isset($account->picture) ? $account->picture->uri : NULL;
// Check if image is displayed in user's profile page.
$this->drupalGet('user');
@@ -1189,7 +1188,7 @@ class UserPictureTestCase extends DrupalWebTestCase {
// Load actual user data from database.
$account1 = user_load($this->user->uid, TRUE);
- $this->assertFalse($account1->picture, 'User object has no picture');
+ $this->assertNull($account1->picture, 'User object has no picture');
$file = file_load($account->picture->fid);
$this->assertFalse($file, 'File is removed from database');
@@ -1205,7 +1204,7 @@ class UserPictureTestCase extends DrupalWebTestCase {
// Load actual user data from database.
$account = user_load($this->user->uid, TRUE);
- return !empty($account->picture) ? $account->picture->uri : NULL;
+ return isset($account->picture) ? $account->picture->uri : NULL;
}
/**
@@ -1678,7 +1677,7 @@ class UserSaveTestCase extends DrupalWebTestCase {
public static function getInfo() {
return array(
'name' => 'User save test',
- 'description' => 'Test account saving for arbitrary new uid.',
+ 'description' => 'Test user_save() for arbitrary new uid.',
'group' => 'User',
);
}
@@ -1693,15 +1692,16 @@ class UserSaveTestCase extends DrupalWebTestCase {
$test_name = $this->randomName();
// Create the base user, based on drupalCreateUser().
- $user = entity_create('user', array(
+ $user = array(
'name' => $test_name,
'uid' => $test_uid,
'mail' => $test_name . '@example.com',
+ 'is_new' => TRUE,
'pass' => user_password(),
'status' => 1,
- ));
- $user->enforceIsNew();
- $user->save();
+ );
+ $user_by_return = user_save(drupal_anonymous_user(), $user);
+ $this->assertTrue($user_by_return, t('Loading user by return of user_save().'));
// Test if created user exists.
$user_by_uid = user_load($test_uid);
@@ -1843,9 +1843,9 @@ class UserEditTestCase extends DrupalWebTestCase {
// Create a regular user.
$user1 = $this->drupalCreateUser(array());
// This user has no e-mail address.
- $user1->mail = '';
- $user1->save();
- $this->drupalPost("user/$user1->uid/edit", array('mail' => ''), t('Save'));
+ $edit = array('mail' => '');
+ $user1 = user_save($user1, $edit);
+ $this->drupalPost("user/$user1->uid/edit", $edit, t('Save'));
$this->assertRaw(t("The changes have been saved."));
}
}
diff --git a/core/scripts/drupal.sh b/core/scripts/drupal.sh
index cf17e68..fb5e82c 100755
--- a/core/scripts/drupal.sh
+++ b/core/scripts/drupal.sh
@@ -119,16 +119,15 @@ while ($param = array_shift($_SERVER['argv'])) {
$cmd = substr($path['path'], 1);
}
elseif (isset($path['path'])) {
- if (!isset($_GET['q'])) {
- $_REQUEST['q'] = $_GET['q'] = $path['path'];
- }
+ $_SERVER['SCRIPT_NAME'] = '/' . $cmd;
+ $_SERVER['REQUEST_URI'] = $path['path'];
}
// display setup in verbose mode
if ($_verbose_mode) {
echo "Hostname set to: {$_SERVER['HTTP_HOST']}\n";
echo "Script name set to: {$cmd}\n";
- echo "Path set to: {$_GET['q']}\n";
+ echo "Path set to: {$path['path']}\n";
}
}
break;
diff --git a/core/scripts/run-tests.sh b/core/scripts/run-tests.sh
index 47bfd48..cc2665f 100755
--- a/core/scripts/run-tests.sh
+++ b/core/scripts/run-tests.sh
@@ -155,7 +155,7 @@ All arguments are long options.
One or more tests to be run. By default, these are interpreted
as the names of test groups as shown at
- ?q=admin/config/development/testing.
+ admin/config/development/testing.
These group names typically correspond to module names like "User"
or "Profile" or "System", but there is also a group "XML-RPC".
If --class is specified then these are interpreted as the names of
@@ -363,8 +363,6 @@ function simpletest_script_run_one_test($test_id, $test_class) {
// Bootstrap Drupal.
drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL);
- simpletest_classloader_register();
-
$test = new $test_class($test_id);
$test->run();
$info = $test->getInfo();
@@ -398,7 +396,7 @@ function simpletest_script_command($test_id, $test_class) {
if ($args['color']) {
$command .= ' --color';
}
- $command .= " --php " . escapeshellarg($php) . " --test-id $test_id --execute-test " . escapeshellarg($test_class);
+ $command .= " --php " . escapeshellarg($php) . " --test-id $test_id --execute-test $test_class";
return $command;
}
diff --git a/core/themes/bartik/templates/comment-wrapper.tpl.php b/core/themes/bartik/templates/comment-wrapper.tpl.php
index dc06cf2..4ddb639 100644
--- a/core/themes/bartik/templates/comment-wrapper.tpl.php
+++ b/core/themes/bartik/templates/comment-wrapper.tpl.php
@@ -20,7 +20,7 @@
* the template.
*
* The following variables are provided for contextual information.
- * - $node: Node entity the comments are attached to.
+ * - $node: Node object the comments are attached to.
* The constants below the variables show the possible values and should be
* used for comparison.
* - $display_mode
diff --git a/core/themes/bartik/templates/comment.tpl.php b/core/themes/bartik/templates/comment.tpl.php
index 0b70594..1648580 100644
--- a/core/themes/bartik/templates/comment.tpl.php
+++ b/core/themes/bartik/templates/comment.tpl.php
@@ -46,7 +46,7 @@
*
* These two variables are provided for context:
* - $comment: Full comment object.
- * - $node: Node entity the comments are attached to.
+ * - $node: Node object the comments are attached to.
*
* Other variables:
* - $classes_array: Array of html class attribute values. It is flattened
diff --git a/core/themes/bartik/templates/node.tpl.php b/core/themes/bartik/templates/node.tpl.php
index 318197c..68f8ec5 100644
--- a/core/themes/bartik/templates/node.tpl.php
+++ b/core/themes/bartik/templates/node.tpl.php
@@ -42,7 +42,7 @@
* the template.
*
* Other variables:
- * - $node: Full node entity. Contains data that may not be safe.
+ * - $node: Full node object. Contains data that may not be safe.
* - $type: Node type, i.e. page, article, etc.
* - $comment_count: Number of comments attached to the node.
* - $uid: User ID of the node author.
diff --git a/core/themes/bartik/templates/page.tpl.php b/core/themes/bartik/templates/page.tpl.php
index f753093..bb3e18f 100644
--- a/core/themes/bartik/templates/page.tpl.php
+++ b/core/themes/bartik/templates/page.tpl.php
@@ -57,7 +57,7 @@
* - $action_links (array): Actions local to the page, such as 'Add menu' on
* the menu administration interface.
* - $feed_icons: A string of all feed icons for the current page.
- * - $node: The node entity, if there is an automatically-loaded node
+ * - $node: The node object, if there is an automatically-loaded node
* associated with the page, and the node ID is the second argument
* in the page's path (e.g. node/12345 and node/12345/revisions, but not
* comment/reply/12345).
diff --git a/core/update.php b/core/update.php
index 9797833..3b05dd0 100644
--- a/core/update.php
+++ b/core/update.php
@@ -461,13 +461,15 @@ if (update_access_allowed()) {
// update.php ops.
case 'selection':
- if (isset($_GET['token']) && $_GET['token'] == drupal_get_token('update')) {
+ $token = request()->query->get('token');
+ if (isset($token) && drupal_valid_token($token, 'update')) {
$output = update_selection_page();
break;
}
case 'Apply pending updates':
- if (isset($_GET['token']) && $_GET['token'] == drupal_get_token('update')) {
+ $token = request()->query->get('token');
+ if (isset($token) && drupal_valid_token($token, 'update')) {
// Generate absolute URLs for the batch processing (using $base_root),
// since the batch API will pass them to url() which does not handle
// update.php correctly by default.
diff --git a/index.php b/index.php
index b91fb1e..6ebb47f 100644
--- a/index.php
+++ b/index.php
@@ -11,11 +11,34 @@
* See COPYRIGHT.txt and LICENSE.txt files in the "core" directory.
*/
+use Drupal\Core\DrupalKernel;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\EventDispatcher\EventDispatcher;
+use Symfony\Component\HttpKernel\Controller\ControllerResolver;
+
/**
* Root directory of Drupal installation.
*/
define('DRUPAL_ROOT', getcwd());
-
+// Bootstrap the lowest level of what we need.
require_once DRUPAL_ROOT . '/core/includes/bootstrap.inc';
+drupal_bootstrap(DRUPAL_BOOTSTRAP_CONFIGURATION);
+
+// A request object from the HTTPFoundation to tell us about the request.
+$request = Request::createFromGlobals();
+
+// Set the global $request object. This is a temporary measure to
+// keep legacy utility functions working. It should be moved to a dependency
+// injection container at some point.
+request($request);
+
drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL);
-menu_execute_active_handler();
+
+$dispatcher = new EventDispatcher();
+$resolver = new ControllerResolver();
+
+$kernel = new DrupalKernel($dispatcher, $resolver);
+$response = $kernel->handle($request);
+$response->prepare($request);
+$response->send();
+$kernel->terminate($request, $response);
diff --git a/robots.txt b/robots.txt
index 90bec1e..d590fbf 100644
--- a/robots.txt
+++ b/robots.txt
@@ -35,12 +35,12 @@ Disallow: /user/password/
Disallow: /user/login/
Disallow: /user/logout/
# Paths (no clean URLs)
-Disallow: /?q=admin/
-Disallow: /?q=comment/reply/
-Disallow: /?q=filter/tips/
-Disallow: /?q=node/add/
-Disallow: /?q=search/
-Disallow: /?q=user/password/
-Disallow: /?q=user/register/
-Disallow: /?q=user/login/
-Disallow: /?q=user/logout/
+Disallow: /index.php/admin/
+Disallow: /index.php/comment/reply/
+Disallow: /index.php/filter/tips/
+Disallow: /index.php/node/add/
+Disallow: /index.php/search/
+Disallow: /index.php/user/password/
+Disallow: /index.php/user/register/
+Disallow: /index.php/user/login/
+Disallow: /index.php/user/logout/
diff --git a/web.config b/web.config
index e990e03..06e4cbe 100644
--- a/web.config
+++ b/web.config
@@ -57,7 +57,9 @@
-->
-
+
@@ -65,9 +67,6 @@
-