Commit 3b1aa6c1 authored by Riccardo Padovani's avatar Riccardo Padovani

Updated Drupal core to 7.30

parent 0e2475ef
Drupal 7.30, 2014-07-24
-----------------------
- Fixed a regression introduced in Drupal 7.29 that caused files or images
attached to taxonomy terms to be deleted when the taxonomy term was edited
and resaved (and other related bugs with contributed and custom modules).
- Added a warning on the permissions page to recommend restricting access to
the "View site reports" permission to trusted administrators. See
DRUPAL-PSA-2014-002.
- Numerous API documentation improvements.
- Additional automated test coverage.
Drupal 7.29, 2014-07-16 Drupal 7.29, 2014-07-16
---------------------- ----------------------
- Fixed security issues (multiple vulnerabilities). See SA-CORE-2014-003. - Fixed security issues (multiple vulnerabilities). See SA-CORE-2014-003.
......
...@@ -139,9 +139,6 @@ Accessibility ...@@ -139,9 +139,6 @@ Accessibility
Documentation Documentation
- Jennifer Hodgdon 'jhodgdon' http://drupal.org/user/155601 - Jennifer Hodgdon 'jhodgdon' http://drupal.org/user/155601
Security
- Greg Knaddison 'greggles' http://drupal.org/user/36762
Translations Translations
- Gerhard Killesreiter 'killes' http://drupal.org/user/83 - Gerhard Killesreiter 'killes' http://drupal.org/user/83
...@@ -154,6 +151,20 @@ Node Access ...@@ -154,6 +151,20 @@ Node Access
- Ken Rickard 'agentrickard' http://drupal.org/user/20975 - Ken Rickard 'agentrickard' http://drupal.org/user/20975
- Jess Myrbo 'xjm' http://drupal.org/user/65776 - Jess Myrbo 'xjm' http://drupal.org/user/65776
Security team
-----------------
To report a security issue, see: https://drupal.org/security-team/report-issue
The Drupal security team provides Security Advisories for vulnerabilities,
assists developers in resolving security issues, and provides security
documentation. See http://drupal.org/security-team for more information. The
security team lead is:
- Michael Hess 'mlhess' https://drupal.org/user/102818
Module maintainers Module maintainers
------------------ ------------------
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
/** /**
* The current system version. * The current system version.
*/ */
define('VERSION', '7.29'); define('VERSION', '7.30');
/** /**
* Core API compatibility. * Core API compatibility.
......
...@@ -544,37 +544,32 @@ function drupal_get_destination() { ...@@ -544,37 +544,32 @@ function drupal_get_destination() {
} }
/** /**
* Parses a system URL string into an associative array suitable for url(). * Parses a URL string into its path, query, and fragment components.
* *
* This function should only be used for URLs that have been generated by the * This function splits both internal paths like @code node?b=c#d @endcode and
* system, such as via url(). It should not be used for URLs that come from * external URLs like @code https://example.com/a?b=c#d @endcode into their
* external sources, or URLs that link to external resources. * component parts. See
* @link http://tools.ietf.org/html/rfc3986#section-3 RFC 3986 @endlink for an
* explanation of what the component parts are.
* *
* The returned array contains a 'path' that may be passed separately to url(). * Note that, unlike the RFC, when passed an external URL, this function
* For example: * groups the scheme, authority, and path together into the path component.
* @code
* $options = drupal_parse_url($_GET['destination']);
* $my_url = url($options['path'], $options);
* $my_link = l('Example link', $options['path'], $options);
* @endcode
* *
* This is required, because url() does not support relative URLs containing a * @param string $url
* query string or fragment in its $path argument. Instead, any query string * The internal path or external URL string to parse.
* needs to be parsed into an associative query parameter array in
* $options['query'] and the fragment into $options['fragment'].
*
* @param $url
* The URL string to parse, f.e. $_GET['destination'].
* *
* @return * @return array
* An associative array containing the keys: * An associative array containing:
* - 'path': The path of the URL. If the given $url is external, this includes * - path: The path component of $url. If $url is an external URL, this
* the scheme and host. * includes the scheme, authority, and path.
* - 'query': An array of query parameters of $url, if existent. * - query: An array of query parameters from $url, if they exist.
* - 'fragment': The fragment of $url, if existent. * - fragment: The fragment component from $url, if it exists.
* *
* @see url()
* @see drupal_goto() * @see drupal_goto()
* @see l()
* @see url()
* @see http://tools.ietf.org/html/rfc3986
*
* @ingroup php_wrappers * @ingroup php_wrappers
*/ */
function drupal_parse_url($url) { function drupal_parse_url($url) {
......
...@@ -2832,7 +2832,7 @@ function db_drop_table($table) { ...@@ -2832,7 +2832,7 @@ function db_drop_table($table) {
* will be set to the value of the key in all rows. This is most useful for * will be set to the value of the key in all rows. This is most useful for
* creating NOT NULL columns with no default value in existing tables. * creating NOT NULL columns with no default value in existing tables.
* @param $keys_new * @param $keys_new
* Optional keys and indexes specification to be created on the table along * (optional) Keys and indexes specification to be created on the table along
* with adding the field. The format is the same as a table specification, but * with adding the field. The format is the same as a table specification, but
* without the 'fields' element. If you are adding a type 'serial' field, you * without the 'fields' element. If you are adding a type 'serial' field, you
* MUST specify at least one key or index including it in this array. See * MUST specify at least one key or index including it in this array. See
...@@ -3012,7 +3012,7 @@ function db_drop_index($table, $name) { ...@@ -3012,7 +3012,7 @@ function db_drop_index($table, $name) {
* @param $spec * @param $spec
* The field specification for the new field. * The field specification for the new field.
* @param $keys_new * @param $keys_new
* Optional keys and indexes specification to be created on the table along * (optional) Keys and indexes specification to be created on the table along
* with changing the field. The format is the same as a table specification * with changing the field. The format is the same as a table specification
* but without the 'fields' element. * but without the 'fields' element.
*/ */
......
...@@ -416,7 +416,7 @@ abstract class DatabaseSchema implements QueryPlaceholderInterface { ...@@ -416,7 +416,7 @@ abstract class DatabaseSchema implements QueryPlaceholderInterface {
* This is most useful for creating NOT NULL columns with no default * This is most useful for creating NOT NULL columns with no default
* value in existing tables. * value in existing tables.
* @param $keys_new * @param $keys_new
* Optional keys and indexes specification to be created on the * (optional) Keys and indexes specification to be created on the
* table along with adding the field. The format is the same as a * table along with adding the field. The format is the same as a
* table specification but without the 'fields' element. If you are * table specification but without the 'fields' element. If you are
* adding a type 'serial' field, you MUST specify at least one key * adding a type 'serial' field, you MUST specify at least one key
...@@ -630,7 +630,7 @@ abstract class DatabaseSchema implements QueryPlaceholderInterface { ...@@ -630,7 +630,7 @@ abstract class DatabaseSchema implements QueryPlaceholderInterface {
* @param $spec * @param $spec
* The field specification for the new field. * The field specification for the new field.
* @param $keys_new * @param $keys_new
* Optional keys and indexes specification to be created on the * (optional) Keys and indexes specification to be created on the
* table along with changing the field. The format is the same as a * table along with changing the field. The format is the same as a
* table specification but without the 'fields' element. * table specification but without the 'fields' element.
* *
......
...@@ -46,7 +46,7 @@ interface DrupalEntityControllerInterface { ...@@ -46,7 +46,7 @@ interface DrupalEntityControllerInterface {
class DrupalDefaultEntityController implements DrupalEntityControllerInterface { class DrupalDefaultEntityController implements DrupalEntityControllerInterface {
/** /**
* Static cache of entities. * Static cache of entities, keyed by entity ID.
* *
* @var array * @var array
*/ */
......
...@@ -9,7 +9,9 @@ ...@@ -9,7 +9,9 @@
* Invokes XML-RPC methods on this server. * Invokes XML-RPC methods on this server.
* *
* @param array $callbacks * @param array $callbacks
* Array of external XML-RPC method names with the callbacks they map to. * Either an associative array of external XML-RPC method names as keys with
* the callbacks they map to as values, or a more complex structure
* describing XML-RPC callbacks as returned from hook_xmlrpc().
*/ */
function xmlrpc_server($callbacks) { function xmlrpc_server($callbacks) {
$xmlrpc_server = new stdClass(); $xmlrpc_server = new stdClass();
......
...@@ -7,8 +7,8 @@ files[] = aggregator.test ...@@ -7,8 +7,8 @@ files[] = aggregator.test
configure = admin/config/services/aggregator/settings configure = admin/config/services/aggregator/settings
stylesheets[all][] = aggregator.css stylesheets[all][] = aggregator.css
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -5,8 +5,8 @@ version = VERSION ...@@ -5,8 +5,8 @@ version = VERSION
core = 7.x core = 7.x
hidden = TRUE hidden = TRUE
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -6,8 +6,8 @@ core = 7.x ...@@ -6,8 +6,8 @@ core = 7.x
files[] = block.test files[] = block.test
configure = admin/structure/block configure = admin/structure/block
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -5,8 +5,8 @@ version = VERSION ...@@ -5,8 +5,8 @@ version = VERSION
core = 7.x core = 7.x
hidden = TRUE hidden = TRUE
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -13,8 +13,8 @@ regions[footer] = Footer ...@@ -13,8 +13,8 @@ regions[footer] = Footer
regions[highlighted] = Highlighted regions[highlighted] = Highlighted
regions[help] = Help regions[help] = Help
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -5,8 +5,8 @@ version = VERSION ...@@ -5,8 +5,8 @@ version = VERSION
core = 7.x core = 7.x
files[] = blog.test files[] = blog.test
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -7,8 +7,8 @@ files[] = book.test ...@@ -7,8 +7,8 @@ files[] = book.test
configure = admin/content/book/settings configure = admin/content/book/settings
stylesheets[all][] = book.css stylesheets[all][] = book.css
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -5,8 +5,8 @@ version = VERSION ...@@ -5,8 +5,8 @@ version = VERSION
core = 7.x core = 7.x
files[] = color.test files[] = color.test
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -9,8 +9,8 @@ files[] = comment.test ...@@ -9,8 +9,8 @@ files[] = comment.test
configure = admin/content/comment configure = admin/content/comment
stylesheets[all][] = comment.css stylesheets[all][] = comment.css
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -6,8 +6,8 @@ core = 7.x ...@@ -6,8 +6,8 @@ core = 7.x
files[] = contact.test files[] = contact.test
configure = admin/structure/contact configure = admin/structure/contact
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -5,8 +5,8 @@ version = VERSION ...@@ -5,8 +5,8 @@ version = VERSION
core = 7.x core = 7.x
files[] = contextual.test files[] = contextual.test
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -7,8 +7,8 @@ files[] = dashboard.test ...@@ -7,8 +7,8 @@ files[] = dashboard.test
dependencies[] = block dependencies[] = block
configure = admin/dashboard/customize configure = admin/dashboard/customize
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -5,8 +5,8 @@ version = VERSION ...@@ -5,8 +5,8 @@ version = VERSION
core = 7.x core = 7.x
files[] = dblog.test files[] = dblog.test
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -540,9 +540,9 @@ function field_create_instance($instance) { ...@@ -540,9 +540,9 @@ function field_create_instance($instance) {
* // Fetch an instance info array. * // Fetch an instance info array.
* $instance_info = field_info_instance($entity_type, $field_name, $bundle_name); * $instance_info = field_info_instance($entity_type, $field_name, $bundle_name);
* // Change a single property in the instance definition. * // Change a single property in the instance definition.
* $instance_info['definition']['required'] = TRUE; * $instance_info['required'] = TRUE;
* // Write the changed definition back. * // Write the changed definition back.
* field_update_instance($instance_info['definition']); * field_update_instance($instance_info);
* @endcode * @endcode
* *
* @throws FieldException * @throws FieldException
......
...@@ -11,8 +11,8 @@ dependencies[] = field_sql_storage ...@@ -11,8 +11,8 @@ dependencies[] = field_sql_storage
required = TRUE required = TRUE
stylesheets[all][] = theme/field.css stylesheets[all][] = theme/field.css
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -961,6 +961,13 @@ function field_has_data($field) { ...@@ -961,6 +961,13 @@ function field_has_data($field) {
/** /**
* Determine whether the user has access to a given field. * Determine whether the user has access to a given field.
* *
* This function does not determine whether access is granted to the entity
* itself, only the specific field. Callers are responsible for ensuring that
* entity access is also respected. For example, when checking field access for
* nodes, check node_access() before checking field_access(), and when checking
* field access for entities using the Entity API contributed module,
* check entity_access() before checking field_access().
*
* @param $op * @param $op
* The operation to be performed. Possible values: * The operation to be performed. Possible values:
* - 'edit' * - 'edit'
......
...@@ -7,8 +7,8 @@ dependencies[] = field ...@@ -7,8 +7,8 @@ dependencies[] = field
files[] = field_sql_storage.test files[] = field_sql_storage.test
required = TRUE required = TRUE
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -7,8 +7,8 @@ dependencies[] = field ...@@ -7,8 +7,8 @@ dependencies[] = field
dependencies[] = options dependencies[] = options
files[] = tests/list.test files[] = tests/list.test
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -5,8 +5,8 @@ package = Testing ...@@ -5,8 +5,8 @@ package = Testing
version = VERSION version = VERSION
hidden = TRUE hidden = TRUE
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -6,8 +6,8 @@ core = 7.x ...@@ -6,8 +6,8 @@ core = 7.x
dependencies[] = field dependencies[] = field
files[] = number.test files[] = number.test
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -6,8 +6,8 @@ core = 7.x ...@@ -6,8 +6,8 @@ core = 7.x
dependencies[] = field dependencies[] = field
files[] = options.test files[] = options.test
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -7,8 +7,8 @@ dependencies[] = field ...@@ -7,8 +7,8 @@ dependencies[] = field
files[] = text.test files[] = text.test
required = TRUE required = TRUE
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -6,8 +6,8 @@ files[] = field_test.entity.inc ...@@ -6,8 +6,8 @@ files[] = field_test.entity.inc
version = VERSION version = VERSION
hidden = TRUE hidden = TRUE
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -134,6 +134,9 @@ function hook_field_widget_settings_form($field, $instance) { ...@@ -134,6 +134,9 @@ function hook_field_widget_settings_form($field, $instance) {
/** /**
* Specify the form elements for a formatter's settings. * Specify the form elements for a formatter's settings.
* *
* This hook is only invoked if hook_field_formatter_settings_summary()
* returns a non-empty value.
*
* @param $field * @param $field
* The field structure being configured. * The field structure being configured.
* @param $instance * @param $instance
......
...@@ -6,8 +6,8 @@ core = 7.x ...@@ -6,8 +6,8 @@ core = 7.x
dependencies[] = field dependencies[] = field
files[] = field_ui.test files[] = field_ui.test
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -6,8 +6,8 @@ core = 7.x ...@@ -6,8 +6,8 @@ core = 7.x
dependencies[] = field dependencies[] = field
files[] = tests/file.test files[] = tests/file.test
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -478,6 +478,7 @@ function file_managed_file_process($element, &$form_state, $form) { ...@@ -478,6 +478,7 @@ function file_managed_file_process($element, &$form_state, $form) {
*/ */
function file_managed_file_value(&$element, $input = FALSE, $form_state = NULL) { function file_managed_file_value(&$element, $input = FALSE, $form_state = NULL) {
$fid = 0; $fid = 0;
$force_default = FALSE;
// Find the current value of this field from the form state. // Find the current value of this field from the form state.
$form_state_fid = $form_state['values']; $form_state_fid = $form_state['values'];
...@@ -510,16 +511,25 @@ function file_managed_file_value(&$element, $input = FALSE, $form_state = NULL) ...@@ -510,16 +511,25 @@ function file_managed_file_value(&$element, $input = FALSE, $form_state = NULL)
$callback($element, $input, $form_state); $callback($element, $input, $form_state);
} }
} }
// Load file and check access if the FID has changed, to confirm it // If a FID was submitted, load the file (and check access if it's not a
// exists and that the current user has access to it. // public file) to confirm it exists and that the current user has access
if (isset($input['fid']) && ($file = file_load($input['fid'])) && file_download_access($file->uri)) { // to it.
if (isset($input['fid']) && ($file = file_load($input['fid']))) {
if (file_uri_scheme($file->uri) == 'public' || file_download_access($file->uri)) {
$fid = $file->fid; $fid = $file->fid;
} }
// If the current user doesn't have access, don't let the file be
// changed.
else {
$force_default = TRUE;
}
}
} }
} }
// If there is no input, set the default value. // If there is no input or if the default value was requested above, use the
else { // default value.
if ($input === FALSE || $force_default) {
if ($element['#extended']) { if ($element['#extended']) {
$default_fid = isset($element['#default_value']['fid']) ? $element['#default_value']['fid'] : 0; $default_fid = isset($element['#default_value']['fid']) ? $element['#default_value']['fid'] : 0;
$return = isset($element['#default_value']) ? $element['#default_value'] : array('fid' => 0); $return = isset($element['#default_value']) ? $element['#default_value'] : array('fid' => 0);
......
...@@ -220,6 +220,128 @@ class FileFieldTestCase extends DrupalWebTestCase { ...@@ -220,6 +220,128 @@ class FileFieldTestCase extends DrupalWebTestCase {
} }
} }
/**
* Tests adding a file to a non-node entity.
*/
class FileTaxonomyTermTestCase extends DrupalWebTestCase {
protected $admin_user;
public static function getInfo() {
return array(
'name' => 'Taxonomy term file test',
'description' => 'Tests adding a file to a non-node entity.',
'group' => 'File',
);
}
public function setUp() {
$modules[] = 'file';
$modules[] = 'taxonomy';
parent::setUp($modules);
$this->admin_user = $this->drupalCreateUser(array('access content', 'access administration pages', 'administer site configuration', 'administer taxonomy'));
$this->drupalLogin($this->admin_user);
}
/**
* Creates a file field and attaches it to the "Tags" taxonomy vocabulary.
*
* @param $name
* The field name of the file field to create.
* @param $uri_scheme
* The URI scheme to use for the file field (for example, "private" to
* create a field that stores private files or "public" to create a field
* that stores public files).
*/
protected function createAttachFileField($name, $uri_scheme) {
$field = array(
'field_name' => $name,
'type' => 'file',
'settings' => array(
'uri_scheme' => $uri_scheme,
),
'cardinality' => 1,
);
field_create_field($field);
// Attach an instance of it.
$instance = array(
'field_name' => $name,
'label' => 'File',
'entity_type' => 'taxonomy_term',
'bundle' => 'tags',
'required' => FALSE,
'settings' => array(),
'widget' => array(
'type' => 'file_generic',
'settings' => array(),
),
);
field_create_instance($instance);
}
/**
* Tests that a public file can be attached to a taxonomy term.
*
* This is a regression test for https://www.drupal.org/node/2305017.
*/
public function testTermFilePublic() {
$this->_testTermFile('public');
}
/**
* Tests that a private file can be attached to a taxonomy term.
*
* This is a regression test for https://www.drupal.org/node/2305017.
*/
public function testTermFilePrivate() {
$this->_testTermFile('private');
}
/**
* Runs tests for attaching a file field to a taxonomy term.
*
* @param $uri_scheme
* The URI scheme to use for the file field, either "public" or "private".
*/
protected function _testTermFile($uri_scheme) {
$field_name = strtolower($this->randomName());
$this->createAttachFileField($field_name, $uri_scheme);
// Get a file to upload.
$file = current($this->drupalGetTestFiles('text'));
// Add a filesize property to files as would be read by file_load().
$file->filesize = filesize($file->uri);
$langcode = LANGUAGE_NONE;
$edit = array(
"name" => $this->randomName(),
);
// Attach a file to the term.
$edit['files[' . $field_name . '_' . $langcode . '_0]'] = drupal_realpath($file->uri);
$this->drupalPost("admin/structure/taxonomy/tags/add", $edit, t('Save'));
// Find the term ID we just created.
$tid = db_query_range('SELECT tid FROM {taxonomy_term_data} ORDER BY tid DESC', 0, 1)->fetchField();
$terms = entity_load('taxonomy_term', array($tid));
$term = $terms[$tid];
$fid = $term->{$field_name}[LANGUAGE_NONE][0]['fid'];
// Check that the uploaded file is present on the edit form.
$this->drupalGet("taxonomy/term/$tid/edit");
$file_input_name = $field_name . '[' . LANGUAGE_NONE . '][0][fid]';
$this->assertFieldByXpath('//input[@type="hidden" and @name="' . $file_input_name . '"]', $fid, 'File is attached on edit form.');
// Edit the term and change name without changing the file.
$edit = array(
"name" => $this->randomName(),
);
$this->drupalPost("taxonomy/term/$tid/edit", $edit, t('Save'));
// Check that the uploaded file is still present on the edit form.
$this->drupalGet("taxonomy/term/$tid/edit");
$file_input_name = $field_name . '[' . LANGUAGE_NONE . '][0][fid]';
$this->assertFieldByXpath('//input[@type="hidden" and @name="' . $file_input_name . '"]', $fid, 'File is attached on edit form.');
// Load term while resetting the cache.
$terms = entity_load('taxonomy_term', array($tid), array(), TRUE);
$term = $terms[$tid];
$this->assertTrue(!empty($term->{$field_name}[LANGUAGE_NONE]), 'Term has attached files.');
$this->assertEqual($term->{$field_name}[LANGUAGE_NONE][0]['fid'], $fid, 'Same File ID is attached to the term.');
}
}
/** /**
* Tests the 'managed_file' element type. * Tests the 'managed_file' element type.
* *
......
...@@ -5,8 +5,8 @@ version = VERSION ...@@ -5,8 +5,8 @@ version = VERSION
core = 7.x core = 7.x
hidden = TRUE hidden = TRUE
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -7,8 +7,8 @@ files[] = filter.test ...@@ -7,8 +7,8 @@ files[] = filter.test
required = TRUE required = TRUE
configure = admin/config/content/formats configure = admin/config/content/formats
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -9,8 +9,8 @@ files[] = forum.test ...@@ -9,8 +9,8 @@ files[] = forum.test
configure = admin/structure/forum configure = admin/structure/forum
stylesheets[all][] = forum.css stylesheets[all][] = forum.css
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
<?php
/**
* @file
* Hooks provided by the Help module.
*/
/**
* @addtogroup hooks
* @{
*/
/**
* Provide online user help.
*
* By implementing hook_help(), a module can make documentation available to
* the user for the module as a whole, or for specific paths. Help for
* developers should usually be provided via function header comments in the
* code, or in special API example files.
*
* For a detailed usage example, see page_example.module.
*
* @param $path
* The router menu path, as defined in hook_menu(), for the help that is
* being requested; e.g., 'admin/people' or 'user/register'. If the router
* path includes a wildcard, then this will appear in $path as %, even if it
* is a named %autoloader wildcard in the hook_menu() implementation; for
* example, node pages would have $path equal to 'node/%' or 'node/%/view'.
* To provide a help page for a whole module with a listing on admin/help,
* your hook implementation should match a path with a special descriptor
* after a "#" sign:
* 'admin/help#modulename'
* The main module help text, displayed on the admin/help/modulename
* page and linked to from the admin/help page.
* @param $arg
* An array that corresponds to the return value of the arg() function, for
* modules that want to provide help that is specific to certain values
* of wildcards in $path. For example, you could provide help for the path
* 'user/1' by looking for the path 'user/%' and $arg[1] == '1'. This given
* array should always be used rather than directly invoking arg(), because
* your hook implementation may be called for other purposes besides building
* the current page's help. Note that depending on which module is invoking
* hook_help, $arg may contain only empty strings. Regardless, $arg[0] to
* $arg[11] will always be set.
*
* @return
* A localized string containing the help text.
*/
function hook_help($path, $arg) {
switch ($path) {
// Main module help for the block module
case 'admin/help#block':
return '<p>' . t('Blocks are boxes of content rendered into an area, or region, of a web page. The default theme Bartik, for example, implements the regions "Sidebar first", "Sidebar second", "Featured", "Content", "Header", "Footer", etc., and a block may appear in any one of these areas. The <a href="@blocks">blocks administration page</a> provides a drag-and-drop interface for assigning a block to a region, and for controlling the order of blocks within regions.', array('@blocks' => url('admin/structure/block'))) . '</p>';
// Help for another path in the block module
case 'admin/structure/block':
return '<p>' . t('This page provides a drag-and-drop interface for assigning a block to a region, and for controlling the order of blocks within regions. Since not all themes implement the same regions, or display regions in the same way, blocks are positioned on a per-theme basis. Remember that your changes will not be saved until you click the <em>Save blocks</em> button at the bottom of the page.') . '</p>';
}
}
/**
* @} End of "addtogroup hooks".
*/
...@@ -5,8 +5,8 @@ version = VERSION ...@@ -5,8 +5,8 @@ version = VERSION
core = 7.x core = 7.x
files[] = help.test files[] = help.test
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -7,8 +7,8 @@ dependencies[] = file ...@@ -7,8 +7,8 @@ dependencies[] = file
files[] = image.test files[] = image.test
configure = admin/config/media/image-styles configure = admin/config/media/image-styles
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -6,8 +6,8 @@ core = 7.x ...@@ -6,8 +6,8 @@ core = 7.x
files[] = image_module_test.module files[] = image_module_test.module
hidden = TRUE hidden = TRUE
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -6,8 +6,8 @@ core = 7.x ...@@ -6,8 +6,8 @@ core = 7.x
files[] = locale.test files[] = locale.test
configure = admin/config/regional/language configure = admin/config/regional/language
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -5,8 +5,8 @@ package = Testing ...@@ -5,8 +5,8 @@ package = Testing
version = VERSION version = VERSION
hidden = TRUE hidden = TRUE
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -6,8 +6,8 @@ core = 7.x ...@@ -6,8 +6,8 @@ core = 7.x
files[] = menu.test files[] = menu.test
configure = admin/structure/menu configure = admin/structure/menu
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -9,8 +9,8 @@ required = TRUE ...@@ -9,8 +9,8 @@ required = TRUE
configure = admin/structure/types configure = admin/structure/types
stylesheets[all][] = node.css stylesheets[all][] = node.css
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -5,8 +5,8 @@ version = VERSION ...@@ -5,8 +5,8 @@ version = VERSION
core = 7.x core = 7.x
hidden = TRUE hidden = TRUE
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -5,8 +5,8 @@ version = VERSION ...@@ -5,8 +5,8 @@ version = VERSION
core = 7.x core = 7.x
hidden = TRUE hidden = TRUE
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -5,8 +5,8 @@ version = VERSION ...@@ -5,8 +5,8 @@ version = VERSION
core = 7.x core = 7.x
hidden = TRUE hidden = TRUE
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -5,8 +5,8 @@ package = Core ...@@ -5,8 +5,8 @@ package = Core
core = 7.x core = 7.x
files[] = openid.test files[] = openid.test
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -6,8 +6,8 @@ core = 7.x ...@@ -6,8 +6,8 @@ core = 7.x
dependencies[] = openid dependencies[] = openid
hidden = TRUE hidden = TRUE
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -4,8 +4,8 @@ package = Core ...@@ -4,8 +4,8 @@ package = Core
version = VERSION version = VERSION
core = 7.x core = 7.x
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -6,8 +6,8 @@ core = 7.x ...@@ -6,8 +6,8 @@ core = 7.x
files[] = path.test files[] = path.test
configure = admin/config/search/path configure = admin/config/search/path
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -5,8 +5,8 @@ version = VERSION ...@@ -5,8 +5,8 @@ version = VERSION
core = 7.x core = 7.x
files[] = php.test files[] = php.test
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -6,8 +6,8 @@ core = 7.x ...@@ -6,8 +6,8 @@ core = 7.x
files[] = poll.test files[] = poll.test
stylesheets[all][] = poll.css stylesheets[all][] = poll.css
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -11,8 +11,8 @@ configure = admin/config/people/profile ...@@ -11,8 +11,8 @@ configure = admin/config/people/profile
; See user_system_info_alter(). ; See user_system_info_alter().
hidden = TRUE hidden = TRUE
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -5,8 +5,8 @@ version = VERSION ...@@ -5,8 +5,8 @@ version = VERSION
core = 7.x core = 7.x
files[] = rdf.test files[] = rdf.test
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -5,8 +5,8 @@ version = VERSION ...@@ -5,8 +5,8 @@ version = VERSION
core = 7.x core = 7.x
hidden = TRUE hidden = TRUE
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -8,8 +8,8 @@ files[] = search.test ...@@ -8,8 +8,8 @@ files[] = search.test
configure = admin/config/search/settings configure = admin/config/search/settings
stylesheets[all][] = search.css stylesheets[all][] = search.css
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -5,8 +5,8 @@ version = VERSION ...@@ -5,8 +5,8 @@ version = VERSION
core = 7.x core = 7.x
hidden = TRUE hidden = TRUE
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -5,8 +5,8 @@ version = VERSION ...@@ -5,8 +5,8 @@ version = VERSION
core = 7.x core = 7.x
hidden = TRUE hidden = TRUE
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -6,8 +6,8 @@ core = 7.x ...@@ -6,8 +6,8 @@ core = 7.x
files[] = shortcut.test files[] = shortcut.test
configure = admin/config/user-interface/shortcut configure = admin/config/user-interface/shortcut
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -2624,8 +2624,6 @@ class DrupalWebTestCase extends DrupalTestCase { ...@@ -2624,8 +2624,6 @@ class DrupalWebTestCase extends DrupalTestCase {
* *
* @param $label * @param $label
* Text between the anchor tags. * Text between the anchor tags.
* @param $index
* Link position counting from zero.
* @param $message * @param $message
* Message to display. * Message to display.
* @param $group * @param $group
...@@ -3189,7 +3187,7 @@ class DrupalWebTestCase extends DrupalTestCase { ...@@ -3189,7 +3187,7 @@ class DrupalWebTestCase extends DrupalTestCase {
* @param $callback * @param $callback
* The name of the theme function to invoke; e.g. 'links' for theme_links(). * The name of the theme function to invoke; e.g. 'links' for theme_links().
* @param $variables * @param $variables
* An array of variables to pass to the theme function. * (optional) An array of variables to pass to the theme function.
* @param $expected * @param $expected
* The expected themed output string. * The expected themed output string.
* @param $message * @param $message
...@@ -3225,7 +3223,9 @@ class DrupalWebTestCase extends DrupalTestCase { ...@@ -3225,7 +3223,9 @@ class DrupalWebTestCase extends DrupalTestCase {
* @param $xpath * @param $xpath
* XPath used to find the field. * XPath used to find the field.
* @param $value * @param $value
* (optional) Value of the field to assert. * (optional) Value of the field to assert. You may pass in NULL (default)
* to skip checking the actual value, while still checking that the field
* exists.
* @param $message * @param $message
* (optional) Message to display. * (optional) Message to display.
* @param $group * @param $group
...@@ -3293,12 +3293,14 @@ class DrupalWebTestCase extends DrupalTestCase { ...@@ -3293,12 +3293,14 @@ class DrupalWebTestCase extends DrupalTestCase {
} }
/** /**
* Asserts that a field does not exist in the current page by the given XPath. * Asserts that a field doesn't exist or its value doesn't match, by XPath.
* *
* @param $xpath * @param $xpath
* XPath used to find the field. * XPath used to find the field.
* @param $value * @param $value
* (optional) Value of the field to assert. * (optional) Value for the field, to assert that the field's value on the
* page doesn't match it. You may pass in NULL to skip checking the
* value, while still checking that the field doesn't exist.
* @param $message * @param $message
* (optional) Message to display. * (optional) Message to display.
* @param $group * @param $group
...@@ -3331,7 +3333,9 @@ class DrupalWebTestCase extends DrupalTestCase { ...@@ -3331,7 +3333,9 @@ class DrupalWebTestCase extends DrupalTestCase {
* @param $name * @param $name
* Name of field to assert. * Name of field to assert.
* @param $value * @param $value
* Value of the field to assert. * (optional) Value of the field to assert. You may pass in NULL (default)
* to skip checking the actual value, while still checking that the field
* exists.
* @param $message * @param $message
* Message to display. * Message to display.
* @param $group * @param $group
...@@ -3362,9 +3366,12 @@ class DrupalWebTestCase extends DrupalTestCase { ...@@ -3362,9 +3366,12 @@ class DrupalWebTestCase extends DrupalTestCase {
* @param $name * @param $name
* Name of field to assert. * Name of field to assert.
* @param $value * @param $value
* Value of the field to assert. * (optional) Value for the field, to assert that the field's value on the
* page doesn't match it. You may pass in NULL to skip checking the
* value, while still checking that the field doesn't exist. However, the
* default value ('') asserts that the field value is not an empty string.
* @param $message * @param $message
* Message to display. * (optional) Message to display.
* @param $group * @param $group
* The group this message belongs to. * The group this message belongs to.
* @return * @return
...@@ -3375,14 +3382,17 @@ class DrupalWebTestCase extends DrupalTestCase { ...@@ -3375,14 +3382,17 @@ class DrupalWebTestCase extends DrupalTestCase {
} }
/** /**
* Asserts that a field exists in the current page with the given id and value. * Asserts that a field exists in the current page with the given ID and value.
* *
* @param $id * @param $id
* Id of field to assert. * ID of field to assert.
* @param $value * @param $value
* Value of the field to assert. * (optional) Value for the field to assert. You may pass in NULL to skip
* checking the value, while still checking that the field exists.
* However, the default value ('') asserts that the field value is an empty
* string.
* @param $message * @param $message
* Message to display. * (optional) Message to display.
* @param $group * @param $group
* The group this message belongs to. * The group this message belongs to.
* @return * @return
...@@ -3393,14 +3403,17 @@ class DrupalWebTestCase extends DrupalTestCase { ...@@ -3393,14 +3403,17 @@ class DrupalWebTestCase extends DrupalTestCase {
} }
/** /**
* Asserts that a field does not exist with the given id and value. * Asserts that a field does not exist with the given ID and value.
* *
* @param $id * @param $id
* Id of field to assert. * ID of field to assert.
* @param $value * @param $value
* Value of the field to assert. * (optional) Value for the field, to assert that the field's value on the
* page doesn't match it. You may pass in NULL to skip checking the value,
* while still checking that the field doesn't exist. However, the default
* value ('') asserts that the field value is not an empty string.
* @param $message * @param $message
* Message to display. * (optional) Message to display.
* @param $group * @param $group
* The group this message belongs to. * The group this message belongs to.
* @return * @return
...@@ -3414,9 +3427,9 @@ class DrupalWebTestCase extends DrupalTestCase { ...@@ -3414,9 +3427,9 @@ class DrupalWebTestCase extends DrupalTestCase {
* Asserts that a checkbox field in the current page is checked. * Asserts that a checkbox field in the current page is checked.
* *
* @param $id * @param $id
* Id of field to assert. * ID of field to assert.
* @param $message * @param $message
* Message to display. * (optional) Message to display.
* @return * @return
* TRUE on pass, FALSE on fail. * TRUE on pass, FALSE on fail.
*/ */
...@@ -3429,9 +3442,9 @@ class DrupalWebTestCase extends DrupalTestCase { ...@@ -3429,9 +3442,9 @@ class DrupalWebTestCase extends DrupalTestCase {
* Asserts that a checkbox field in the current page is not checked. * Asserts that a checkbox field in the current page is not checked.
* *
* @param $id * @param $id
* Id of field to assert. * ID of field to assert.
* @param $message * @param $message
* Message to display. * (optional) Message to display.
* @return * @return
* TRUE on pass, FALSE on fail. * TRUE on pass, FALSE on fail.
*/ */
...@@ -3444,11 +3457,11 @@ class DrupalWebTestCase extends DrupalTestCase { ...@@ -3444,11 +3457,11 @@ class DrupalWebTestCase extends DrupalTestCase {
* Asserts that a select option in the current page is checked. * Asserts that a select option in the current page is checked.
* *
* @param $id * @param $id
* Id of select field to assert. * ID of select field to assert.
* @param $option * @param $option
* Option to assert. * Option to assert.
* @param $message * @param $message
* Message to display. * (optional) Message to display.
* @return * @return
* TRUE on pass, FALSE on fail. * TRUE on pass, FALSE on fail.
* *
...@@ -3463,11 +3476,11 @@ class DrupalWebTestCase extends DrupalTestCase { ...@@ -3463,11 +3476,11 @@ class DrupalWebTestCase extends DrupalTestCase {
* Asserts that a select option in the current page is not checked. * Asserts that a select option in the current page is not checked.
* *
* @param $id * @param $id
* Id of select field to assert. * ID of select field to assert.
* @param $option * @param $option
* Option to assert. * Option to assert.
* @param $message * @param $message
* Message to display. * (optional) Message to display.
* @return * @return
* TRUE on pass, FALSE on fail. * TRUE on pass, FALSE on fail.
*/ */
...@@ -3477,12 +3490,12 @@ class DrupalWebTestCase extends DrupalTestCase { ...@@ -3477,12 +3490,12 @@ class DrupalWebTestCase extends DrupalTestCase {
} }
/** /**
* Asserts that a field exists with the given name or id. * Asserts that a field exists with the given name or ID.
* *
* @param $field * @param $field
* Name or id of field to assert. * Name or ID of field to assert.
* @param $message * @param $message
* Message to display. * (optional) Message to display.
* @param $group * @param $group
* The group this message belongs to. * The group this message belongs to.
* @return * @return
...@@ -3493,12 +3506,12 @@ class DrupalWebTestCase extends DrupalTestCase { ...@@ -3493,12 +3506,12 @@ class DrupalWebTestCase extends DrupalTestCase {
} }
/** /**
* Asserts that a field does not exist with the given name or id. * Asserts that a field does not exist with the given name or ID.
* *
* @param $field * @param $field
* Name or id of field to assert. * Name or ID of field to assert.
* @param $message * @param $message
* Message to display. * (optional) Message to display.
* @param $group * @param $group
* The group this message belongs to. * The group this message belongs to.
* @return * @return
......
...@@ -56,8 +56,8 @@ files[] = tests/upgrade/update.trigger.test ...@@ -56,8 +56,8 @@ files[] = tests/upgrade/update.trigger.test
files[] = tests/upgrade/update.field.test files[] = tests/upgrade/update.field.test
files[] = tests/upgrade/update.user.test files[] = tests/upgrade/update.user.test
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -5,8 +5,8 @@ version = VERSION ...@@ -5,8 +5,8 @@ version = VERSION
core = 7.x core = 7.x
hidden = TRUE hidden = TRUE
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -5,8 +5,8 @@ package = Testing ...@@ -5,8 +5,8 @@ package = Testing
version = VERSION version = VERSION
hidden = TRUE hidden = TRUE
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -5,8 +5,8 @@ version = VERSION ...@@ -5,8 +5,8 @@ version = VERSION
core = 7.x core = 7.x
hidden = TRUE hidden = TRUE
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -5,8 +5,8 @@ version = VERSION ...@@ -5,8 +5,8 @@ version = VERSION
core = 7.x core = 7.x
hidden = TRUE hidden = TRUE
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -7,8 +7,8 @@ stylesheets[all][] = common_test.css ...@@ -7,8 +7,8 @@ stylesheets[all][] = common_test.css
stylesheets[print][] = common_test.print.css stylesheets[print][] = common_test.print.css
hidden = TRUE hidden = TRUE
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -5,8 +5,8 @@ version = VERSION ...@@ -5,8 +5,8 @@ version = VERSION
core = 7.x core = 7.x
hidden = TRUE hidden = TRUE
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -5,8 +5,8 @@ package = Testing ...@@ -5,8 +5,8 @@ package = Testing
version = VERSION version = VERSION
hidden = TRUE hidden = TRUE
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -5,8 +5,8 @@ version = VERSION ...@@ -5,8 +5,8 @@ version = VERSION
core = 7.x core = 7.x
hidden = TRUE hidden = TRUE
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -5,8 +5,8 @@ version = VERSION ...@@ -5,8 +5,8 @@ version = VERSION
core = 7.x core = 7.x
hidden = TRUE hidden = TRUE
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -6,8 +6,8 @@ core = 7.x ...@@ -6,8 +6,8 @@ core = 7.x
dependencies[] = entity_cache_test_dependency dependencies[] = entity_cache_test_dependency
hidden = TRUE hidden = TRUE
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -5,8 +5,8 @@ version = VERSION ...@@ -5,8 +5,8 @@ version = VERSION
core = 7.x core = 7.x
hidden = TRUE hidden = TRUE
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -5,8 +5,8 @@ package = Testing ...@@ -5,8 +5,8 @@ package = Testing
version = VERSION version = VERSION
hidden = TRUE hidden = TRUE
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -5,8 +5,8 @@ version = VERSION ...@@ -5,8 +5,8 @@ version = VERSION
core = 7.x core = 7.x
hidden = TRUE hidden = TRUE
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -5,8 +5,8 @@ version = VERSION ...@@ -5,8 +5,8 @@ version = VERSION
core = 7.x core = 7.x
hidden = TRUE hidden = TRUE
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -6,8 +6,8 @@ core = 7.x ...@@ -6,8 +6,8 @@ core = 7.x
files[] = file_test.module files[] = file_test.module
hidden = TRUE hidden = TRUE
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -5,8 +5,8 @@ version = VERSION ...@@ -5,8 +5,8 @@ version = VERSION
core = 7.x core = 7.x
hidden = TRUE hidden = TRUE
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -5,8 +5,8 @@ version = VERSION ...@@ -5,8 +5,8 @@ version = VERSION
core = 7.x core = 7.x
hidden = TRUE hidden = TRUE
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -5,8 +5,8 @@ version = VERSION ...@@ -5,8 +5,8 @@ version = VERSION
core = 7.x core = 7.x
hidden = TRUE hidden = TRUE
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -5,8 +5,8 @@ version = VERSION ...@@ -5,8 +5,8 @@ version = VERSION
core = 7.x core = 7.x
hidden = TRUE hidden = TRUE
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -5,8 +5,8 @@ version = VERSION ...@@ -5,8 +5,8 @@ version = VERSION
core = 7.x core = 7.x
hidden = TRUE hidden = TRUE
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -5,8 +5,8 @@ version = VERSION ...@@ -5,8 +5,8 @@ version = VERSION
core = 7.x core = 7.x
hidden = TRUE hidden = TRUE
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -5,8 +5,8 @@ core = 7.x ...@@ -5,8 +5,8 @@ core = 7.x
hidden = TRUE hidden = TRUE
package = Testing package = Testing
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -5,8 +5,8 @@ version = VERSION ...@@ -5,8 +5,8 @@ version = VERSION
core = 7.x core = 7.x
hidden = TRUE hidden = TRUE
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -7,8 +7,8 @@ version = VERSION ...@@ -7,8 +7,8 @@ version = VERSION
core = 7.x core = 7.x
hidden = TRUE hidden = TRUE
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -5,8 +5,8 @@ version = VERSION ...@@ -5,8 +5,8 @@ version = VERSION
core = 7.x core = 7.x
hidden = TRUE hidden = TRUE
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -6,8 +6,8 @@ core = 7.x ...@@ -6,8 +6,8 @@ core = 7.x
hidden = TRUE hidden = TRUE
dependencies[] = _missing_dependency dependencies[] = _missing_dependency
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -6,8 +6,8 @@ core = 7.x ...@@ -6,8 +6,8 @@ core = 7.x
hidden = TRUE hidden = TRUE
dependencies[] = system_incompatible_core_version_test dependencies[] = system_incompatible_core_version_test
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -5,8 +5,8 @@ version = VERSION ...@@ -5,8 +5,8 @@ version = VERSION
core = 5.x core = 5.x
hidden = TRUE hidden = TRUE
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -7,8 +7,8 @@ hidden = TRUE ...@@ -7,8 +7,8 @@ hidden = TRUE
; system_incompatible_module_version_test declares version 1.0 ; system_incompatible_module_version_test declares version 1.0
dependencies[] = system_incompatible_module_version_test (>2.0) dependencies[] = system_incompatible_module_version_test (>2.0)
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -5,8 +5,8 @@ version = 1.0 ...@@ -5,8 +5,8 @@ version = 1.0
core = 7.x core = 7.x
hidden = TRUE hidden = TRUE
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -6,8 +6,8 @@ core = 7.x ...@@ -6,8 +6,8 @@ core = 7.x
files[] = system_test.module files[] = system_test.module
hidden = TRUE hidden = TRUE
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -6,8 +6,8 @@ core = 7.x ...@@ -6,8 +6,8 @@ core = 7.x
hidden = TRUE hidden = TRUE
dependencies[] = taxonomy dependencies[] = taxonomy
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -5,8 +5,8 @@ version = VERSION ...@@ -5,8 +5,8 @@ version = VERSION
core = 7.x core = 7.x
hidden = TRUE hidden = TRUE
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -6,8 +6,8 @@ hidden = TRUE ...@@ -6,8 +6,8 @@ hidden = TRUE
settings[basetheme_only] = base theme value settings[basetheme_only] = base theme value
settings[subtheme_override] = base theme value settings[subtheme_override] = base theme value
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
...@@ -6,8 +6,8 @@ hidden = TRUE ...@@ -6,8 +6,8 @@ hidden = TRUE
settings[subtheme_override] = subtheme value settings[subtheme_override] = subtheme value
; Information added by Drupal.org packaging script on 2014-07-16 ; Information added by Drupal.org packaging script on 2014-07-24
version = "7.29" version = "7.30"
project = "drupal" project = "drupal"
datestamp = "1405543132" datestamp = "1406239730"
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment