diff --git a/core/MAINTAINERS.txt b/core/MAINTAINERS.txt
index 611a6033b93ef140a35a4c5be76f2600c780c287..564cffa716c7144d9e13bd9310ecc079bf3c2710 100644
--- a/core/MAINTAINERS.txt
+++ b/core/MAINTAINERS.txt
@@ -225,7 +225,7 @@ PHP module
- ?
Poll module
-- ?
+- Andrei Mateescu 'amateescu' <http://drupal.org/user/729614>
RDF module
- Stéphane Corlosquet 'scor' <http://drupal.org/user/52142>
diff --git a/core/includes/common.inc b/core/includes/common.inc
index ab96757cc09979fd3eddb2e9846c3839d68bc73c..6d1c44b7c897ddc7cf538a54734d54fec00889a3 100644
--- a/core/includes/common.inc
+++ b/core/includes/common.inc
@@ -2967,6 +2967,18 @@ function drupal_get_css($css = NULL, $skip_alter = FALSE) {
// Sort CSS items, so that they appear in the correct order.
uasort($css, 'drupal_sort_css_js');
+ // Provide the page with information about the individual CSS files used,
+ // information not otherwise available when CSS aggregation is enabled. The
+ // setting is attached later in this function, but is set here, so that CSS
+ // files removed below are still considered "used" and prevented from being
+ // added in a later AJAX request.
+ // Skip if no files were added to the page or jQuery.extend() will overwrite
+ // the Drupal.settings.ajaxPageState.css object with an empty array.
+ if (!empty($css)) {
+ // Cast the array to an object to be on the safe side even if not empty.
+ $setting['ajaxPageState']['css'] = (object) array_fill_keys(array_keys($css), 1);
+ }
+
// Remove the overridden CSS files. Later CSS files override former ones.
$previous_item = array();
foreach ($css as $key => $item) {
@@ -2986,14 +2998,7 @@ function drupal_get_css($css = NULL, $skip_alter = FALSE) {
'#type' => 'styles',
'#items' => $css,
);
-
- // Provide the page with information about the individual CSS files used,
- // information not otherwise available when CSS aggregation is enabled.
- // Skip if no files were added to the page or jQuery.extend() will overwrite
- // the Drupal.settings.ajaxPageState.css object with an empty array.
- // Cast the array to an object to be on the safe side even if not empty.
- if (!empty($css)) {
- $setting['ajaxPageState']['css'] = (object) array_fill_keys(array_keys($css), 1);
+ if (!empty($setting)) {
$styles['#attached']['js'][] = array('type' => 'setting', 'data' => $setting);
}
diff --git a/core/includes/theme.inc b/core/includes/theme.inc
index 92070d535f05184dab72c36ee5e4a28747e4064b..fbb78045ea0edcae432dd52b663e96f2373d984d 100644
--- a/core/includes/theme.inc
+++ b/core/includes/theme.inc
@@ -1035,6 +1035,13 @@ function theme($hook, $variables = array()) {
if (isset($info['base hook'])) {
$base_hook = $info['base hook'];
$base_hook_info = $hooks[$base_hook];
+ // Include files required by the base hook, since its variable processors
+ // might reside there.
+ if (!empty($base_hook_info['includes'])) {
+ foreach ($base_hook_info['includes'] as $include_file) {
+ include_once DRUPAL_ROOT . '/' . $include_file;
+ }
+ }
if (isset($base_hook_info['preprocess functions']) || isset($base_hook_info['process functions'])) {
$variables['theme_hook_suggestion'] = $hook;
$hook = $base_hook;
diff --git a/core/includes/unicode.inc b/core/includes/unicode.inc
index 50b7fe0681906666d9ca8f31edd11764ed12b72f..1450b435fa1e6cc4ba2596de071bda48d1ca5dd8 100644
--- a/core/includes/unicode.inc
+++ b/core/includes/unicode.inc
@@ -73,7 +73,7 @@
'\x{A836}-\x{A839}\x{A874}-\x{A877}\x{A8CE}-\x{A8CF}\x{A8F8}-\x{A8FA}' .
'\x{A92E}-\x{A92F}\x{A95F}\x{A9C1}-\x{A9CD}\x{A9DE}-\x{A9DF}' .
'\x{AA5C}-\x{AA5F}\x{AA77}-\x{AA79}\x{AADE}-\x{AADF}\x{ABEB}' .
- '\x{D800}-\x{F8FF}\x{FB29}\x{FD3E}-\x{FD3F}\x{FDFC}-\x{FDFD}' .
+ '\x{E000}-\x{F8FF}\x{FB29}\x{FD3E}-\x{FD3F}\x{FDFC}-\x{FDFD}' .
'\x{FE10}-\x{FE19}\x{FE30}-\x{FE6B}\x{FEFF}-\x{FF0F}\x{FF1A}-\x{FF20}' .
'\x{FF3B}-\x{FF40}\x{FF5B}-\x{FF65}\x{FFE0}-\x{FFFD}');
diff --git a/core/misc/machine-name.js b/core/misc/machine-name.js
index 996cf842c2cde8bb253695fd3f303a5c9dffe973..4f1be3beff59fe1d8475086161df225d44ca0b5a 100644
--- a/core/misc/machine-name.js
+++ b/core/misc/machine-name.js
@@ -77,9 +77,11 @@ Drupal.behaviors.machineName = {
$source.bind('keyup.machineName change.machineName', function () {
machine = self.transliterate($(this).val(), options);
// Set the machine name to the transliterated value.
- if (machine != options.replace && machine != '') {
- $target.val(machine);
- $preview.text(machine);
+ if (machine != '') {
+ if (machine != options.replace) {
+ $target.val(machine);
+ $preview.text(machine);
+ }
$suffix.show();
}
else {
diff --git a/core/misc/tableselect.js b/core/misc/tableselect.js
index 5a88ac20ccc49caf78d3fbbfebb736cc6b932104..fee63a9fd8bd5b509705403423d5d765711a73e5 100644
--- a/core/misc/tableselect.js
+++ b/core/misc/tableselect.js
@@ -17,7 +17,8 @@ Drupal.tableSelect = function () {
var table = this, checkboxes, lastChecked;
var strings = { 'selectAll': Drupal.t('Select all rows in this table'), 'selectNone': Drupal.t('Deselect all rows in this table') };
var updateSelectAll = function (state) {
- $('th.select-all input:checkbox', table).each(function () {
+ // Update table's select-all checkbox (and sticky header's if available).
+ $(table).prev('table.sticky-header').andSelf().find('th.select-all input:checkbox').each(function() {
$(this).attr('title', state ? strings.selectNone : strings.selectAll);
this.checked = state;
});
diff --git a/core/modules/aggregator/aggregator.admin.inc b/core/modules/aggregator/aggregator.admin.inc
index 93319bfe797acbb68d8d78aeac6c2f8aaf6dbb84..a728920a660cb163683f3557c297f83b5ce96595 100644
--- a/core/modules/aggregator/aggregator.admin.inc
+++ b/core/modules/aggregator/aggregator.admin.inc
@@ -37,7 +37,7 @@ function aggregator_view() {
($feed->checked && $feed->refresh ? t('%time left', array('%time' => format_interval($feed->checked + $feed->refresh - REQUEST_TIME))) : t('never')),
l(t('edit'), "admin/config/services/aggregator/edit/feed/$feed->fid"),
l(t('remove items'), "admin/config/services/aggregator/remove/$feed->fid"),
- l(t('update items'), "admin/config/services/aggregator/update/$feed->fid"),
+ l(t('update items'), "admin/config/services/aggregator/update/$feed->fid", array('query' => array('token' => drupal_get_token("aggregator/update/$feed->fid")))),
);
}
$output .= theme('table', array('header' => $header, 'rows' => $rows, 'empty' => t('No feeds available. <a href="@link">Add feed</a>.', array('@link' => url('admin/config/services/aggregator/add/feed')))));
@@ -84,7 +84,7 @@ function aggregator_form_feed($form, &$form_state, stdClass $feed = NULL) {
$form['url'] = array('#type' => 'textfield',
'#title' => t('URL'),
'#default_value' => isset($feed->url) ? $feed->url : '',
- '#maxlength' => 255,
+ '#maxlength' => NULL,
'#description' => t('The fully-qualified URL of the feed.'),
'#required' => TRUE,
);
@@ -421,6 +421,9 @@ function _aggregator_parse_opml($opml) {
* @see aggregator_menu()
*/
function aggregator_admin_refresh_feed($feed) {
+ if (!isset($_GET['token']) || !drupal_valid_token($_GET['token'], 'aggregator/update/' . $feed->fid)) {
+ return MENU_ACCESS_DENIED;
+ }
aggregator_refresh($feed);
drupal_goto('admin/config/services/aggregator');
}
diff --git a/core/modules/aggregator/aggregator.install b/core/modules/aggregator/aggregator.install
index eecd14fb27f1d66ff08d97160a8f820303a18043..ac4fce8befb0c53d74779a35ec7c75f1c985b455 100644
--- a/core/modules/aggregator/aggregator.install
+++ b/core/modules/aggregator/aggregator.install
@@ -130,10 +130,8 @@ function aggregator_schema() {
'description' => 'Title of the feed.',
),
'url' => array(
- 'type' => 'varchar',
- 'length' => 255,
+ 'type' => 'text',
'not null' => TRUE,
- 'default' => '',
'description' => 'URL to the feed.',
),
'refresh' => array(
@@ -155,10 +153,8 @@ function aggregator_schema() {
'description' => 'Time when this feed was queued for refresh, 0 if not queued.',
),
'link' => array(
- 'type' => 'varchar',
- 'length' => 255,
+ 'type' => 'text',
'not null' => TRUE,
- 'default' => '',
'description' => 'The parent website of the feed; comes from the <link> element in the feed.',
),
'description' => array(
@@ -202,13 +198,13 @@ function aggregator_schema() {
)
),
'primary key' => array('fid'),
- 'unique keys' => array(
- 'url' => array('url'),
- 'title' => array('title'),
- ),
'indexes' => array(
+ 'url' => array(array('url', 255)),
'queued' => array('queued'),
),
+ 'unique keys' => array(
+ 'title' => array('title'),
+ ),
);
$schema['aggregator_item'] = array(
@@ -233,10 +229,8 @@ function aggregator_schema() {
'description' => 'Title of the feed item.',
),
'link' => array(
- 'type' => 'varchar',
- 'length' => 255,
+ 'type' => 'text',
'not null' => TRUE,
- 'default' => '',
'description' => 'Link to the feed item.',
),
'author' => array(
@@ -258,9 +252,8 @@ function aggregator_schema() {
'description' => 'Posted date of the feed item, as a Unix timestamp.',
),
'guid' => array(
- 'type' => 'varchar',
- 'length' => 255,
- 'not null' => FALSE,
+ 'type' => 'text',
+ 'not null' => TRUE,
'description' => 'Unique identifier for the feed item.',
)
),
diff --git a/core/modules/aggregator/aggregator.module b/core/modules/aggregator/aggregator.module
index bb66cbefc37d6b4d8bd7891b330f587f81d88117..81b8c7f334e61bd07d64084185482960f05f02ca 100644
--- a/core/modules/aggregator/aggregator.module
+++ b/core/modules/aggregator/aggregator.module
@@ -537,6 +537,7 @@ function aggregator_save_feed($edit) {
'url' => $edit['url'],
'refresh' => $edit['refresh'],
'block' => $edit['block'],
+ 'link' => '',
'description' => '',
'image' => '',
))
@@ -573,15 +574,13 @@ function aggregator_remove($feed) {
// Call hook_aggregator_remove() on all modules.
module_invoke_all('aggregator_remove', $feed);
// Reset feed.
- db_merge('aggregator_feed')
- ->key(array('fid' => $feed->fid))
+ db_update('aggregator_feed')
+ ->condition('fid', $feed->fid)
->fields(array(
'checked' => 0,
'hash' => '',
'etag' => '',
'modified' => 0,
- 'description' => $feed->description,
- 'image' => $feed->image,
))
->execute();
}
diff --git a/core/modules/aggregator/aggregator.test b/core/modules/aggregator/aggregator.test
index 27c46737eb27ad8d358004bf09552af36adfc0e0..02deb4503444fff69f3fa8bffe68dd1d7979d2aa 100644
--- a/core/modules/aggregator/aggregator.test
+++ b/core/modules/aggregator/aggregator.test
@@ -92,8 +92,13 @@ class AggregatorTestCase extends DrupalWebTestCase {
$this->drupalGet($feed->url);
$this->assertResponse(200, t('!url is reachable.', array('!url' => $feed->url)));
- // Refresh the feed (simulated link click).
+ // Attempt to access the update link directly without an access token.
$this->drupalGet('admin/config/services/aggregator/update/' . $feed->fid);
+ $this->assertResponse(403);
+
+ // Refresh the feed (simulated link click).
+ $this->drupalGet('admin/config/services/aggregator');
+ $this->clickLink('update items');
// Ensure we have the right number of items.
$result = db_query('SELECT iid FROM {aggregator_item} WHERE fid = :fid', array(':fid' => $feed->fid));
@@ -349,6 +354,35 @@ class AddFeedTestCase extends AggregatorTestCase {
// Delete feed.
$this->deleteFeed($feed);
}
+
+ /**
+ * Tests feeds with very long URLs.
+ */
+ function testAddLongFeed() {
+ // Create a feed with a URL of > 255 characters.
+ $long_url = "https://www.google.com/search?ix=heb&sourceid=chrome&ie=UTF-8&q=angie+byron#sclient=psy-ab&hl=en&safe=off&source=hp&q=angie+byron&pbx=1&oq=angie+byron&aq=f&aqi=&aql=&gs_sm=3&gs_upl=0l0l0l10534l0l0l0l0l0l0l0l0ll0l0&bav=on.2,or.r_gc.r_pw.r_cp.,cf.osb&fp=a70b6b1f0abe28d8&biw=1629&bih=889&ix=heb";
+ $feed = $this->createFeed($long_url);
+
+ // Create a second feed of > 255 characters, where the only difference is
+ // after the 255th character.
+ $long_url_2 = "https://www.google.com/search?ix=heb&sourceid=chrome&ie=UTF-8&q=angie+byron#sclient=psy-ab&hl=en&safe=off&source=hp&q=angie+byron&pbx=1&oq=angie+byron&aq=f&aqi=&aql=&gs_sm=3&gs_upl=0l0l0l10534l0l0l0l0l0l0l0l0ll0l0&bav=on.2,or.r_gc.r_pw.r_cp.,cf.osb&fp=a70b6b1f0abe28d8&biw=1629&bih=889";
+ $feed_2 = $this->createFeed($long_url_2);
+
+ // Check feed data.
+ $this->assertTrue($this->uniqueFeed($feed->title, $feed->url), 'The first long URL feed is unique.');
+ $this->assertTrue($this->uniqueFeed($feed_2->title, $feed_2->url), 'The second long URL feed is unique.');
+
+ // Check feed source.
+ $this->drupalGet('aggregator/sources/' . $feed->fid);
+ $this->assertResponse(200, 'Long URL feed source exists.');
+ $this->assertText($feed->title, 'Page title');
+ $this->drupalGet('aggregator/sources/' . $feed->fid . '/categorize');
+ $this->assertResponse(200, 'Long URL feed categorization page exists.');
+
+ // Delete feeds.
+ $this->deleteFeed($feed);
+ $this->deleteFeed($feed_2);
+ }
}
class CategorizeFeedTestCase extends AggregatorTestCase {
@@ -502,8 +536,8 @@ class UpdateFeedItemTestCase extends AggregatorTestCase {
$this->assertRaw(t('The feed %name has been added.', array('%name' => $edit['title'])), t('The feed !name has been added.', array('!name' => $edit['title'])));
$feed = db_query("SELECT * FROM {aggregator_feed} WHERE url = :url", array(':url' => $edit['url']))->fetchObject();
- $this->drupalGet('admin/config/services/aggregator/update/' . $feed->fid);
+ aggregator_refresh($feed);
$before = db_query('SELECT timestamp FROM {aggregator_item} WHERE fid = :fid', array(':fid' => $feed->fid))->fetchField();
// Sleep for 3 second.
@@ -517,10 +551,9 @@ class UpdateFeedItemTestCase extends AggregatorTestCase {
'modified' => 0,
))
->execute();
- $this->drupalGet('admin/config/services/aggregator/update/' . $feed->fid);
+ aggregator_refresh($feed);
$after = db_query('SELECT timestamp FROM {aggregator_item} WHERE fid = :fid', array(':fid' => $feed->fid))->fetchField();
-
$this->assertTrue($before === $after, t('Publish timestamp of feed item was not updated (!before === !after)', array('!before' => $before, '!after' => $after)));
}
}
diff --git a/core/modules/book/book-node-export-html.tpl.php b/core/modules/book/book-node-export-html.tpl.php
index 0c2c67cc213dd6eae1cff03f0e0586c78c4745fb..50c878f5b5b9976d8aadfa0bcb17b40122059a6b 100644
--- a/core/modules/book/book-node-export-html.tpl.php
+++ b/core/modules/book/book-node-export-html.tpl.php
@@ -18,8 +18,8 @@
* @ingroup themeable
*/
?>
-<div id="node-<?php print $node->nid; ?>" class="section-<?php print $depth; ?>">
+<article id="node-<?php print $node->nid; ?>" class="section-<?php print $depth; ?>">
<h1 class="book-heading"><?php print $title; ?></h1>
<?php print $content; ?>
<?php print $children; ?>
-</div>
+</article>
diff --git a/core/modules/field/field.info.inc b/core/modules/field/field.info.inc
index 1c9eaf9de1e60a8fa71c8312127926a5e065d012..78bc62e34b8b0da325e6d76b8ab404b23d422a44 100644
--- a/core/modules/field/field.info.inc
+++ b/core/modules/field/field.info.inc
@@ -691,16 +691,16 @@ function field_info_field_by_ids() {
*/
function field_info_instances($entity_type = NULL, $bundle_name = NULL) {
$info = _field_info_collate_fields();
- if (!isset($entity_type)) {
- return $info['instances'];
+
+ if (isset($entity_type) && isset($bundle_name)) {
+ return isset($info['instances'][$entity_type][$bundle_name]) ? $info['instances'][$entity_type][$bundle_name] : array();
}
- if (!isset($bundle_name)) {
- return $info['instances'][$entity_type];
+ elseif (isset($entity_type)) {
+ return isset($info['instances'][$entity_type]) ? $info['instances'][$entity_type] : array();
}
- if (isset($info['instances'][$entity_type][$bundle_name])) {
- return $info['instances'][$entity_type][$bundle_name];
+ else {
+ return $info['instances'];
}
- return array();
}
/**
diff --git a/core/modules/field/modules/text/text.test b/core/modules/field/modules/text/text.test
index 979079ac11ab514b3c72a9c472ea37430b29c0d6..2d936be773ffbc2621f9d9405454dd41294d7cc7 100644
--- a/core/modules/field/modules/text/text.test
+++ b/core/modules/field/modules/text/text.test
@@ -454,8 +454,8 @@ class TextTranslationTestCase extends DrupalWebTestCase {
$langcode = LANGUAGE_NONE;
$body = $this->randomName();
$edit = array(
- "title" => $this->randomName(),
- "language" => 'en',
+ 'title' => $this->randomName(),
+ 'langcode' => 'en',
"body[$langcode][0][value]" => $body,
);
@@ -487,7 +487,7 @@ class TextTranslationTestCase extends DrupalWebTestCase {
$title = $this->randomName();
$edit = array(
'title' => $title,
- 'language' => 'en',
+ 'langcode' => 'en',
);
$this->drupalPost('node/add/article', $edit, t('Save'));
diff --git a/core/modules/field/tests/field.test b/core/modules/field/tests/field.test
index bb3206acc14f3eb0ad19c21be0bba6e23517cb90..9b4cf04bd4977cf370d914ad7be083ac075d59e6 100644
--- a/core/modules/field/tests/field.test
+++ b/core/modules/field/tests/field.test
@@ -1079,11 +1079,14 @@ class FieldInfoTestCase extends FieldTestCase {
}
// Verify that no unexpected instances exist.
- $core_fields = field_info_fields();
+ $instances = field_info_instances('test_entity');
+ $expected = array('test_bundle' => array());
+ $this->assertIdentical($instances, $expected, "field_info_instances('test_entity') returns " . var_export($expected, TRUE) . '.');
$instances = field_info_instances('test_entity', 'test_bundle');
- $this->assertTrue(empty($instances), t('With no instances, info bundles is empty.'));
+ $this->assertIdentical($instances, array(), "field_info_instances('test_entity', 'test_bundle') returns an empty array.");
// Create a field, verify it shows up.
+ $core_fields = field_info_fields();
$field = array(
'field_name' => drupal_strtolower($this->randomName()),
'type' => 'test_field',
@@ -1119,6 +1122,25 @@ class FieldInfoTestCase extends FieldTestCase {
$instances = field_info_instances('test_entity', $instance['bundle']);
$this->assertEqual(count($instances), 1, t('One instance shows up in info when attached to a bundle.'));
$this->assertTrue($instance < $instances[$instance['field_name']], t('Instance appears in info correctly'));
+
+ // Test a valid entity type but an invalid bundle.
+ $instances = field_info_instances('test_entity', 'invalid_bundle');
+ $this->assertIdentical($instances, array(), "field_info_instances('test_entity', 'invalid_bundle') returns an empty array.");
+
+ // Test invalid entity type and bundle.
+ $instances = field_info_instances('invalid_entity', $instance['bundle']);
+ $this->assertIdentical($instances, array(), "field_info_instances('invalid_entity', 'test_bundle') returns an empty array.");
+
+ // Test invalid entity type, no bundle provided.
+ $instances = field_info_instances('invalid_entity');
+ $this->assertIdentical($instances, array(), "field_info_instances('invalid_entity') returns an empty array.");
+
+ // Test with an entity type that has no bundles.
+ $instances = field_info_instances('user');
+ $expected = array('user' => array());
+ $this->assertIdentical($instances, $expected, "field_info_instances('user') returns " . var_export($expected, TRUE) . '.');
+ $instances = field_info_instances('user', 'user');
+ $this->assertIdentical($instances, array(), "field_info_instances('user', 'user') returns an empty array.");
}
/**
diff --git a/core/modules/field_ui/field_ui.admin.inc b/core/modules/field_ui/field_ui.admin.inc
index 24a99e1ea5878842a2c8f7d3c9db53122d371394..5457120dfa0a72bdfcfdedf323044607137c9002 100644
--- a/core/modules/field_ui/field_ui.admin.inc
+++ b/core/modules/field_ui/field_ui.admin.inc
@@ -293,8 +293,8 @@ function theme_field_ui_table($variables) {
* The resulting form allows fields and pseudo-fields to be re-ordered.
*
* @see field_ui_menu()
- * @see field_ui_overview_form_validate().
- * @see field_ui_overview_form_submit().
+ * @see field_ui_field_overview_form_validate()
+ * @see field_ui_field_overview_form_submit()
* @ingroup forms
*/
function field_ui_field_overview_form($form, &$form_state, $entity_type, $bundle) {
@@ -1744,7 +1744,7 @@ function field_ui_widget_type_form_submit($form, &$form_state) {
* hook_entity_info().
*
* @see field_ui_menu()
- * @see field_ui_delete_form_submit()
+ * @see field_ui_field_delete_form_submit()
* @ingroup forms
*/
function field_ui_field_delete_form($form, &$form_state, $instance) {
diff --git a/core/modules/filter/filter.module b/core/modules/filter/filter.module
index 3dc72a64300171abb26724befa04526796b993a9..77f63ef6f7fd945bff8aeb9c2a6cdb3738653da4 100644
--- a/core/modules/filter/filter.module
+++ b/core/modules/filter/filter.module
@@ -1128,7 +1128,7 @@ function filter_dom_serialize_escape_cdata_element($dom_document, $dom_element,
* @ingroup themeable
*/
function theme_filter_tips_more_info() {
- return '<p>' . l(t('More information about text formats'), 'filter/tips') . '</p>';
+ return '<p>' . l(t('More information about text formats'), 'filter/tips', array('attributes' => array('target' => '_blank'))) . '</p>';
}
/**
diff --git a/core/modules/locale/locale.install b/core/modules/locale/locale.install
index a75ee2e602df822c90758c54a18f27b470054978..aad91abbdff8ddcd5f71f011820368e822eeeb52 100644
--- a/core/modules/locale/locale.install
+++ b/core/modules/locale/locale.install
@@ -264,13 +264,25 @@ function locale_update_8001() {
// storing data for blocks will need to update for themselves.
$block_tables = array('block', 'block_node_type', 'block_role');
foreach ($block_tables as $table) {
- db_update($table)
- ->fields(array(
- 'delta' => 'language_interface',
- ))
- ->condition('delta', 'language')
- ->condition('module', 'locale')
- ->execute();
+ // Perform the update only if the language switcher block data is available.
+ $block_data = db_query_range('SELECT 1 FROM {' . $table . '} WHERE delta = :delta AND module = :module', 0, 1, array(':delta' => 'language', ':module' => 'locale'))
+ ->fetchField();
+ if ($block_data) {
+ // If block information is rebuilt before performing the update, we might
+ // already have data for the new delta. In this case we need to remove it
+ // to avoid integrity constraint violation errors.
+ db_delete($table)
+ ->condition('delta', 'language_interface')
+ ->condition('module', 'locale')
+ ->execute();
+ db_update($table)
+ ->fields(array(
+ 'delta' => 'language_interface',
+ ))
+ ->condition('delta', 'language')
+ ->condition('module', 'locale')
+ ->execute();
+ }
}
}
diff --git a/core/modules/locale/locale.module b/core/modules/locale/locale.module
index 98543f960809181056391873edb09b7459542b30..4a786bec443bb9a61993fedd7818b665969a5cd3 100644
--- a/core/modules/locale/locale.module
+++ b/core/modules/locale/locale.module
@@ -292,13 +292,13 @@ function locale_field_node_form_submit($form, &$form_state) {
foreach (field_info_instances('node', $bundle) as $instance) {
$field_name = $instance['field_name'];
$field = field_info_field($field_name);
- $previous_language = $form[$field_name]['#language'];
+ $previous_langcode = $form[$field_name]['#language'];
// Handle a possible language change: new language values are inserted,
// previous ones are deleted.
- if ($field['translatable'] && $previous_language != $node->language) {
- $form_state['values'][$field_name][$node->language] = $node->{$field_name}[$previous_language];
- $form_state['values'][$field_name][$previous_language] = array();
+ if ($field['translatable'] && $previous_langcode != $node->langcode) {
+ $form_state['values'][$field_name][$node->langcode] = $node->{$field_name}[$previous_langcode];
+ $form_state['values'][$field_name][$previous_langcode] = array();
}
}
}
@@ -1085,15 +1085,15 @@ function locale_form_system_file_system_settings_alter(&$form, $form_state) {
* Implements MODULE_preprocess_HOOK().
*/
function locale_preprocess_node(&$variables) {
- if ($variables['language'] != LANGUAGE_NONE) {
+ if ($variables['langcode'] != LANGUAGE_NONE) {
global $language_interface;
- $node_language = language_load($variables['language']);
+ $node_language = language_load($variables['langcode']);
if ($node_language->langcode != $language_interface->langcode) {
// If the node language was different from the page language, we should
// add markup to identify the language. Otherwise the page language is
// inherited.
- $variables['attributes_array']['lang'] = $variables['language'];
+ $variables['attributes_array']['lang'] = $variables['langcode'];
if ($node_language->direction != $language_interface->direction) {
// If text direction is different form the page's text direction, add
// direction information as well.
diff --git a/core/modules/locale/locale.test b/core/modules/locale/locale.test
index 73f10fa4377d3ae9fc5d84c39bcbafdfee924a36..208c5e6882d028eb7d46338e312f538146291283 100644
--- a/core/modules/locale/locale.test
+++ b/core/modules/locale/locale.test
@@ -2002,7 +2002,7 @@ class LocaleContentFunctionalTest extends DrupalWebTestCase {
// Verify language selection appears on add "Basic page" form.
$this->drupalGet('node/add/page');
// Verify language select list is present.
- $this->assertFieldByName('language', NULL, t('Language select present on add Basic page form.'));
+ $this->assertFieldByName('langcode', NULL, t('Language select present on add Basic page form.'));
// Ensure enabled language appears.
$this->assertText($name, t('Enabled language present.'));
// Ensure disabled language doesn't appear.
@@ -2015,7 +2015,7 @@ class LocaleContentFunctionalTest extends DrupalWebTestCase {
'type' => 'page',
'title' => $node_title,
'body' => array($langcode => array(array('value' => $node_body))),
- 'language' => $langcode,
+ 'langcode' => $langcode,
);
$node = $this->drupalCreateNode($edit);
// Edit the content and ensure correct language is selected.
@@ -2024,7 +2024,7 @@ class LocaleContentFunctionalTest extends DrupalWebTestCase {
$this->assertRaw('<option value="' . $langcode . '" selected="selected">' . $name . '</option>', t('Correct language selected.'));
// Ensure we can change the node language.
$edit = array(
- 'language' => 'en',
+ 'langcode' => 'en',
);
$this->drupalPost($path, $edit, t('Save'));
$this->assertRaw(t('%title has been updated.', array('%title' => $node_title)), t('Basic page content updated.'));
@@ -2107,7 +2107,7 @@ class LocaleContentFunctionalTest extends DrupalWebTestCase {
'type' => 'article',
'title' => $node_title,
'body' => array($langcode => array(array('value' => $node_body))),
- 'language' => $langcode,
+ 'langcode' => $langcode,
'promote' => 1,
);
return $this->drupalCreateNode($edit);
@@ -2575,7 +2575,7 @@ class LocaleMultilingualFieldsFunctionalTest extends DrupalWebTestCase {
$edit = array();
$edit[$title_key] = $title_value;
$edit[$body_key] = $body_value;
- $edit['language'] = 'en';
+ $edit['langcode'] = 'en';
$this->drupalPost('node/add/page', $edit, t('Save'));
// Check that the node exists in the database.
@@ -2589,7 +2589,7 @@ class LocaleMultilingualFieldsFunctionalTest extends DrupalWebTestCase {
$this->drupalGet("node/$node->nid/edit");
$edit = array(
$title_key => $this->randomName(8),
- 'language' => 'it'
+ 'langcode' => 'it'
);
$this->drupalPost(NULL, $edit, t('Save'));
$node = $this->drupalGetNodeByTitle($edit[$title_key]);
@@ -2624,7 +2624,7 @@ class LocaleMultilingualFieldsFunctionalTest extends DrupalWebTestCase {
$edit = array();
$edit[$title_key] = $title_value;
$edit[$body_key] = $body_value;
- $edit['language'] = 'en';
+ $edit['langcode'] = 'en';
$this->drupalPost('node/add/page', $edit, t('Save'));
// Check that the node exists in the database.
@@ -2706,7 +2706,7 @@ class LocaleCommentLanguageFunctionalTest extends DrupalWebTestCase {
$edit = array(
"title" => $title,
"body[$langcode_none][0][value]" => $this->randomName(),
- "language" => $node_langcode,
+ "langcode" => $node_langcode,
);
$this->drupalPost("node/add/article", $edit, t('Save'));
$node = $this->drupalGetNodeByTitle($title);
diff --git a/core/modules/node/node.admin.inc b/core/modules/node/node.admin.inc
index e197f6065cc699f06e9ed59d6a6ce650e1fc280e..9578417dfeb87ebd4dd393e2a6c66ace725a54b5 100644
--- a/core/modules/node/node.admin.inc
+++ b/core/modules/node/node.admin.inc
@@ -435,7 +435,7 @@ function node_admin_nodes() {
// Enable language column if translation module is enabled or if we have any
// node with language.
- $multilanguage = (module_exists('translation') || db_query_range("SELECT 1 FROM {node} WHERE language <> :language", 0, 1, array(':language' => LANGUAGE_NONE))->fetchField());
+ $multilanguage = (module_exists('translation') || db_query_range("SELECT 1 FROM {node} WHERE langcode <> :langcode", 0, 1, array(':langcode' => LANGUAGE_NONE))->fetchField());
// Build the sortable table header.
$header = array(
@@ -446,7 +446,7 @@ function node_admin_nodes() {
'changed' => array('data' => t('Updated'), 'field' => 'n.changed', 'sort' => 'desc')
);
if ($multilanguage) {
- $header['language_name'] = array('data' => t('Language'), 'field' => 'n.language');
+ $header['language_name'] = array('data' => t('Language'), 'field' => 'n.langcode');
}
$header['operations'] = array('data' => t('Operations'));
@@ -481,7 +481,7 @@ function node_admin_nodes() {
$destination = drupal_get_destination();
$options = array();
foreach ($nodes as $node) {
- $l_options = $node->language != LANGUAGE_NONE && isset($languages[$node->language]) ? array('language' => $languages[$node->language]) : array();
+ $l_options = $node->langcode != LANGUAGE_NONE && isset($languages[$node->langcode]) ? array('language' => $languages[$node->langcode]) : array();
$options[$node->nid] = array(
'title' => array(
'data' => array(
@@ -498,7 +498,7 @@ function node_admin_nodes() {
'changed' => format_date($node->changed, 'short'),
);
if ($multilanguage) {
- $options[$node->nid]['language_name'] = language_name($node->language);
+ $options[$node->nid]['language_name'] = language_name($node->langcode);
}
// Build a list of all the accessible operations for the current node.
$operations = array();
diff --git a/core/modules/node/node.install b/core/modules/node/node.install
index b9a5ead007b48ca65824e469f8ddb2a445f5d0d5..efcce1ab36c3c8c42dcfed5325d216ff8f152ed5 100644
--- a/core/modules/node/node.install
+++ b/core/modules/node/node.install
@@ -32,7 +32,7 @@ function node_schema() {
'not null' => TRUE,
'default' => '',
),
- 'language' => array(
+ 'langcode' => array(
'description' => 'The {language}.langcode of this node.',
'type' => 'varchar',
'length' => 12,
@@ -541,6 +541,20 @@ function node_update_8001() {
}
}
+/**
+ * Rename node.language field to node.langcode.
+ */
+function node_update_8002() {
+ $spec = array(
+ 'description' => 'The {language}.langcode of this node.',
+ 'type' => 'varchar',
+ 'length' => 12,
+ 'not null' => TRUE,
+ 'default' => '',
+ );
+ db_change_field('node', 'language', 'langcode', $spec);
+}
+
/**
* @} End of "addtogroup updates-7.x-to-8.x"
* The next series of updates should start at 9000.
diff --git a/core/modules/node/node.module b/core/modules/node/node.module
index 2fe2cbcb1c9b4dec5287307580c875d3f825169f..5ee9062dcccc5f84f358d982b893c504bf7a9ca9 100644
--- a/core/modules/node/node.module
+++ b/core/modules/node/node.module
@@ -1340,7 +1340,7 @@ function node_view($node, $view_mode = 'full', $langcode = NULL) {
'#theme' => 'node',
'#node' => $node,
'#view_mode' => $view_mode,
- '#language' => $langcode,
+ '#langcode' => $langcode,
);
// Add contextual links for this node, except when the node is already being
@@ -1724,7 +1724,7 @@ function node_search_execute($keys = NULL, $conditions = NULL) {
// Insert special keywords.
$query->setOption('type', 'n.type');
- $query->setOption('language', 'n.language');
+ $query->setOption('langcode', 'n.langcode');
if ($query->setOption('term', 'ti.tid')) {
$query->join('taxonomy_index', 'ti', 'n.nid = ti.nid');
}
@@ -1764,7 +1764,7 @@ function node_search_execute($keys = NULL, $conditions = NULL) {
'extra' => $extra,
'score' => $item->calculated_score,
'snippet' => search_excerpt($keys, $node->rendered),
- 'language' => $node->language,
+ 'langcode' => $node->langcode,
);
}
return $results;
@@ -2848,10 +2848,8 @@ function node_form_search_form_alter(&$form, $form_state) {
// Languages:
$language_options = array();
- foreach (language_list() as $key => $entity) {
- if ($entity->enabled) {
- $language_options[$key] = $entity->name;
- }
+ foreach (language_list(TRUE) as $langcode => $language) {
+ $language_options[$langcode] = $language->name;
}
if (count($language_options) > 1) {
$form['advanced']['language'] = array(
@@ -4204,9 +4202,9 @@ function node_file_download_access($field, $entity_type, $entity) {
* Implements hook_language_delete().
*/
function node_language_delete($language) {
- // On nodes with this language, unset the language
+ // On nodes with this language, unset the language.
db_update('node')
- ->fields(array('language' => ''))
- ->condition('language', $language->langcode)
+ ->fields(array('langcode' => ''))
+ ->condition('langcode', $language->langcode)
->execute();
}
diff --git a/core/modules/node/node.pages.inc b/core/modules/node/node.pages.inc
index ab8b5f153290485a8e6d8d0d17dafa9cc11cf34a..95e2e7dc9c3c91763f9b4c225514bf52da578a27 100644
--- a/core/modules/node/node.pages.inc
+++ b/core/modules/node/node.pages.inc
@@ -87,7 +87,7 @@ function node_add($type) {
global $user;
$types = node_type_get_types();
- $node = (object) array('uid' => $user->uid, 'name' => (isset($user->name) ? $user->name : ''), 'type' => $type, 'language' => LANGUAGE_NONE);
+ $node = (object) array('uid' => $user->uid, 'name' => (isset($user->name) ? $user->name : ''), 'type' => $type, 'langcode' => LANGUAGE_NONE);
drupal_set_title(t('Create @name', array('@name' => $types[$type]->name)), PASS_THROUGH);
$output = drupal_get_form($type . '_node_form', $node);
@@ -153,7 +153,7 @@ function node_form($form, &$form_state, $node) {
// Basic node information.
// These elements are just values so they are not even sent to the client.
- foreach (array('nid', 'vid', 'uid', 'created', 'type', 'language') as $key) {
+ foreach (array('nid', 'vid', 'uid', 'created', 'type') as $key) {
$form[$key] = array(
'#type' => 'value',
'#value' => isset($node->$key) ? $node->$key : NULL,
@@ -187,20 +187,20 @@ function node_form($form, &$form_state, $node) {
foreach ($languages as $langcode => $language) {
$language_options[$langcode] = $language->name;
}
- $form['language'] = array(
+ $form['langcode'] = array(
'#type' => 'select',
'#title' => t('Language'),
- '#default_value' => (isset($node->language) ? $node->language : ''),
+ '#default_value' => (isset($node->langcode) ? $node->langcode : ''),
'#options' => $language_options,
'#empty_value' => LANGUAGE_NONE,
);
}
else {
- $form['language'] = array(
+ $form['langcode'] = array(
'#type' => 'value',
// New nodes without multilingual support get the default language, old
// nodes keep their language if language.module is not available.
- '#value' => !isset($form['#node']->nid) ? language_default()->langcode : $node->language,
+ '#value' => !isset($form['#node']->nid) ? language_default()->langcode : $node->langcode,
);
}
@@ -358,7 +358,7 @@ function node_form($form, &$form_state, $node) {
}
$form += array('#submit' => array());
- field_attach_form('node', $node, $form, $form_state, $node->language);
+ field_attach_form('node', $node, $form, $form_state, $node->langcode);
return $form;
}
diff --git a/core/modules/node/node.test b/core/modules/node/node.test
index ea6b73e81196bc9a8fdce8b9c538ae6c15dff3b0..02001c713f29f2a658eb3c530d36fdd10c3aa19f 100644
--- a/core/modules/node/node.test
+++ b/core/modules/node/node.test
@@ -510,7 +510,7 @@ class NodeCreationTestCase extends DrupalWebTestCase {
'uid' => $this->loggedInUser->uid,
'name' => $this->loggedInUser->name,
'type' => 'page',
- 'language' => LANGUAGE_NONE,
+ 'langcode' => LANGUAGE_NONE,
'title' => 'testing_transaction_exception',
);
@@ -2190,7 +2190,7 @@ class NodeEntityFieldQueryAlter extends DrupalWebTestCase {
// Creating 4 nodes with an entity field so we can test that sort of query
// alter. All field values starts with 'A' so we can identify and fetch them
// in the node_access_test module.
- $settings = array('language' => LANGUAGE_NONE);
+ $settings = array('langcode' => LANGUAGE_NONE);
for ($i = 0; $i < 4; $i++) {
$body = array(
'value' => 'A' . $this->randomName(32),
@@ -2268,9 +2268,9 @@ class NodeTokenReplaceTestCase extends DrupalWebTestCase {
$tests['[node:type]'] = 'article';
$tests['[node:type-name]'] = 'Article';
$tests['[node:title]'] = check_plain($node->title);
- $tests['[node:body]'] = _text_sanitize($instance, $node->language, $node->body[$node->language][0], 'value');
- $tests['[node:summary]'] = _text_sanitize($instance, $node->language, $node->body[$node->language][0], 'summary');
- $tests['[node:language]'] = check_plain($node->language);
+ $tests['[node:body]'] = _text_sanitize($instance, $node->langcode, $node->body[$node->langcode][0], 'value');
+ $tests['[node:summary]'] = _text_sanitize($instance, $node->langcode, $node->body[$node->langcode][0], 'summary');
+ $tests['[node:langcode]'] = check_plain($node->langcode);
$tests['[node:url]'] = url('node/' . $node->nid, $url_options);
$tests['[node:edit-url]'] = url('node/' . $node->nid . '/edit', $url_options);
$tests['[node:author]'] = check_plain(user_format_name($account));
@@ -2289,9 +2289,9 @@ class NodeTokenReplaceTestCase extends DrupalWebTestCase {
// Generate and test unsanitized tokens.
$tests['[node:title]'] = $node->title;
- $tests['[node:body]'] = $node->body[$node->language][0]['value'];
- $tests['[node:summary]'] = $node->body[$node->language][0]['summary'];
- $tests['[node:language]'] = $node->language;
+ $tests['[node:body]'] = $node->body[$node->langcode][0]['value'];
+ $tests['[node:summary]'] = $node->body[$node->langcode][0]['summary'];
+ $tests['[node:langcode]'] = $node->langcode;
$tests['[node:author:name]'] = user_format_name($account);
foreach ($tests as $input => $expected) {
diff --git a/core/modules/node/node.tokens.inc b/core/modules/node/node.tokens.inc
index abe864a5e6e7f02a57faad9447b3e3db38d301a5..1b37fc8eb89b857ea0044d920d386192b91c1e5f 100644
--- a/core/modules/node/node.tokens.inc
+++ b/core/modules/node/node.tokens.inc
@@ -50,9 +50,9 @@ function node_token_info() {
'name' => t("Summary"),
'description' => t("The summary of the node's main body text."),
);
- $node['language'] = array(
- 'name' => t("Language"),
- 'description' => t("The language the node is written in."),
+ $node['langcode'] = array(
+ 'name' => t('Language code'),
+ 'description' => t('The language code of the language the node is written in.'),
);
$node['url'] = array(
'name' => t("URL"),
@@ -143,8 +143,8 @@ function node_tokens($type, $tokens, array $data = array(), array $options = arr
}
break;
- case 'language':
- $replacements[$original] = $sanitize ? check_plain($node->language) : $node->language;
+ case 'langcode':
+ $replacements[$original] = $sanitize ? check_plain($node->langcode) : $node->langcode;
break;
case 'url':
diff --git a/core/modules/openid/openid.inc b/core/modules/openid/openid.inc
index e1e2861472a9618877c2695cc29660fa25fe3303..518dc8a18c30ec7667fbefc6933bc1458dcb0b8c 100644
--- a/core/modules/openid/openid.inc
+++ b/core/modules/openid/openid.inc
@@ -610,18 +610,31 @@ function _openid_get_params($str) {
* @param $fallback_prefix
* An optional prefix that will be used in case no prefix is found for the
* target extension namespace.
+ * @param $only_signed
+ * Return only keys that are included in the message signature in openid.sig.
+ * Unsigned fields may have been modified or added by other parties than the
+ * OpenID Provider.
+ *
* @return
* An associative array containing all the parameters in the response message
* that belong to the extension. The keys are stripped from their namespace
* prefix.
+ *
* @see http://openid.net/specs/openid-authentication-2_0.html#extensions
*/
-function openid_extract_namespace($response, $extension_namespace, $fallback_prefix = NULL) {
+function openid_extract_namespace($response, $extension_namespace, $fallback_prefix = NULL, $only_signed = FALSE) {
+ $signed_keys = explode(',', $response['openid.signed']);
+
// Find the namespace prefix.
$prefix = $fallback_prefix;
foreach ($response as $key => $value) {
if ($value == $extension_namespace && preg_match('/^openid\.ns\.([^.]+)$/', $key, $matches)) {
$prefix = $matches[1];
+ if ($only_signed && !in_array('ns.' . $matches[1], $signed_keys)) {
+ // The namespace was defined but was not signed as required. In this
+ // case we do not fall back to $fallback_prefix.
+ $prefix = NULL;
+ }
break;
}
}
@@ -634,7 +647,9 @@ function openid_extract_namespace($response, $extension_namespace, $fallback_pre
foreach ($response as $key => $value) {
if (preg_match('/^openid\.' . $prefix . '\.(.+)$/', $key, $matches)) {
$local_key = $matches[1];
- $output[$local_key] = $value;
+ if (!$only_signed || in_array($prefix . '.' . $local_key, $signed_keys)) {
+ $output[$local_key] = $value;
+ }
}
}
diff --git a/core/modules/openid/openid.module b/core/modules/openid/openid.module
index edd73d39cc1dc9798e9e6f04e78aea07454ef7ea..d29d40578832ded4513aff161f2d3c351fc1bae0 100644
--- a/core/modules/openid/openid.module
+++ b/core/modules/openid/openid.module
@@ -185,10 +185,15 @@ function openid_form_user_register_form_alter(&$form, &$form_state) {
$response = $_SESSION['openid']['response'];
- // Extract Simple Registration keys from the response.
- $sreg_values = openid_extract_namespace($response, OPENID_NS_SREG, 'sreg');
- // Extract Attribute Exchanges keys from the response.
- $ax_values = openid_extract_namespace($response, OPENID_NS_AX, 'ax');
+ // Extract Simple Registration keys from the response. We only include
+ // signed keys as required by OpenID Simple Registration Extension 1.0,
+ // section 4.
+ $sreg_values = openid_extract_namespace($response, OPENID_NS_SREG, 'sreg', TRUE);
+ // Extract Attribute Exchanges keys from the response. We only include
+ // signed keys. This is not required by the specification, but it is
+ // recommended by Google, see
+ // http://googlecode.blogspot.com/2011/05/security-advisory-to-websites-using.html
+ $ax_values = openid_extract_namespace($response, OPENID_NS_AX, 'ax', TRUE);
if (!empty($sreg_values['nickname'])) {
// Use the nickname returned by Simple Registration if available.
diff --git a/core/modules/openid/openid.test b/core/modules/openid/openid.test
index 5c6ca69e41e5d624c5d49c6d97472b3472fc9c7f..7f87b4b54514b3d6ca677c5dae59d61fae4f1a38 100644
--- a/core/modules/openid/openid.test
+++ b/core/modules/openid/openid.test
@@ -364,17 +364,49 @@ class OpenIDFunctionalTestCase extends OpenIDWebTestCase {
// Use a User-supplied Identity that is the URL of an XRDS document.
$identity = url('openid-test/yadis/xrds', array('absolute' => TRUE));
- // Do not sign all mandatory fields (e.g. assoc_handle).
+ // Respond with an invalid signature.
+ variable_set('openid_test_response', array('openid.sig' => 'this-is-an-invalid-signature'));
+ $this->submitLoginForm($identity);
+ $this->assertRaw('OpenID login failed.');
+
+ // Do not sign the mandatory field openid.assoc_handle.
variable_set('openid_test_response', array('openid.signed' => 'op_endpoint,claimed_id,identity,return_to,response_nonce'));
$this->submitLoginForm($identity);
$this->assertRaw('OpenID login failed.');
- // Sign all mandatory fields and some custom fields.
- variable_set('openid_test_response', array('openid.foo' => 'bar', 'openid.signed' => 'op_endpoint,claimed_id,identity,return_to,response_nonce,assoc_handle,foo'));
+ // Sign all mandatory fields and a custom field.
+ $keys_to_sign = array('op_endpoint', 'claimed_id', 'identity', 'return_to', 'response_nonce', 'assoc_handle', 'foo');
+ $association = new stdClass();
+ $association->mac_key = variable_get('mac_key');
+ $response = array(
+ 'openid.op_endpoint' => url('openid-test/endpoint', array('absolute' => TRUE)),
+ 'openid.claimed_id' => $identity,
+ 'openid.identity' => $identity,
+ 'openid.return_to' => url('openid/authenticate', array('absolute' => TRUE)),
+ 'openid.response_nonce' => _openid_nonce(),
+ 'openid.assoc_handle' => 'openid-test',
+ 'openid.foo' => 123,
+ 'openid.signed' => implode(',', $keys_to_sign),
+ );
+ $response['openid.sig'] = _openid_signature($association, $response, $keys_to_sign);
+ variable_set('openid_test_response', $response);
$this->submitLoginForm($identity);
$this->assertNoRaw('OpenID login failed.');
- }
+ $this->assertFieldByName('name', '', t('No username was supplied by provider.'));
+ $this->assertFieldByName('mail', '', t('No e-mail address was supplied by provider.'));
+ // Check that unsigned SREG fields are ignored.
+ $response = array(
+ 'openid.signed' => 'op_endpoint,claimed_id,identity,return_to,response_nonce,assoc_handle,sreg.nickname',
+ 'openid.sreg.nickname' => 'john',
+ 'openid.sreg.email' => 'john@example.com',
+ );
+ variable_set('openid_test_response', $response);
+ $this->submitLoginForm($identity);
+ $this->assertNoRaw('OpenID login failed.');
+ $this->assertFieldByName('name', 'john', t('Username was supplied by provider.'));
+ $this->assertFieldByName('mail', '', t('E-mail address supplied by provider was ignored.'));
+ }
}
/**
@@ -707,4 +739,41 @@ class OpenIDUnitTest extends DrupalWebTestCase {
$this->assertEqual(openid_normalize('http://example.com/path#fragment'), 'http://example.com/path', t('openid_normalize() correctly normalized a URL with a fragment.'));
}
+
+ /**
+ * Test openid_extract_namespace().
+ */
+ function testOpenidExtractNamespace() {
+ $response = array(
+ 'openid.sreg.nickname' => 'john',
+ 'openid.ns.ext1' => OPENID_NS_SREG,
+ 'openid.ext1.nickname' => 'george',
+ 'openid.ext1.email' => 'george@example.com',
+ 'openid.ns.ext2' => 'http://example.com/ns/ext2',
+ 'openid.ext2.foo' => '123',
+ 'openid.ext2.bar' => '456',
+ 'openid.signed' => 'sreg.nickname,ns.ext1,ext1.email,ext2.foo',
+ );
+
+ $values = openid_extract_namespace($response, 'http://example.com/ns/dummy', NULL, FALSE);
+ $this->assertEqual($values, array(), t('Nothing found for unused namespace.'));
+
+ $values = openid_extract_namespace($response, 'http://example.com/ns/dummy', 'sreg', FALSE);
+ $this->assertEqual($values, array('nickname' => 'john'), t('Value found for fallback prefix.'));
+
+ $values = openid_extract_namespace($response, OPENID_NS_SREG, 'sreg', FALSE);
+ $this->assertEqual($values, array('nickname' => 'george', 'email' => 'george@example.com'), t('Namespace takes precedence over fallback prefix.'));
+
+ // ext1.email is signed, but ext1.nickname is not.
+ $values = openid_extract_namespace($response, OPENID_NS_SREG, 'sreg', TRUE);
+ $this->assertEqual($values, array('email' => 'george@example.com'), t('Unsigned namespaced fields ignored.'));
+
+ $values = openid_extract_namespace($response, 'http://example.com/ns/ext2', 'sreg', FALSE);
+ $this->assertEqual($values, array('foo' => '123', 'bar' => '456'), t('Unsigned fields found.'));
+
+ // ext2.foo and ext2.bar are ignored, because ns.ext2 is not signed. The
+ // fallback prefix is not used, because the namespace is specified.
+ $values = openid_extract_namespace($response, 'http://example.com/ns/ext2', 'sreg', TRUE);
+ $this->assertEqual($values, array(), t('Unsigned fields ignored.'));
+ }
}
diff --git a/core/modules/openid/tests/openid_test.module b/core/modules/openid/tests/openid_test.module
index 11d32b7c80d3f67984e4f1bdf47334bba94c858f..5bd2f4ddf5bcd60748364b989457a23c607bd1b6 100644
--- a/core/modules/openid/tests/openid_test.module
+++ b/core/modules/openid/tests/openid_test.module
@@ -325,9 +325,7 @@ function _openid_test_endpoint_authenticate() {
// Generate unique identifier for this authentication.
$nonce = _openid_nonce();
- // Generate response containing the user's identity. The openid.sreg.xxx
- // entries contain profile data stored by the OpenID Provider (see OpenID
- // Simple Registration Extension 1.0).
+ // Generate response containing the user's identity.
$response = variable_get('openid_test_response', array()) + array(
'openid.ns' => OPENID_NS_2_0,
'openid.mode' => 'id_res',
@@ -337,14 +335,27 @@ function _openid_test_endpoint_authenticate() {
'openid.return_to' => $_REQUEST['openid_return_to'],
'openid.response_nonce' => $nonce,
'openid.assoc_handle' => 'openid-test',
- 'openid.signed' => 'op_endpoint,claimed_id,identity,return_to,response_nonce,assoc_handle',
);
+ if (isset($response['openid.signed'])) {
+ $keys_to_sign = explode(',', $response['openid.signed']);
+ }
+ else {
+ // Unless openid.signed is explicitly defined, all keys are signed.
+ $keys_to_sign = array();
+ foreach ($response as $key => $value) {
+ // Strip off the "openid." prefix.
+ $keys_to_sign[] = substr($key, 7);
+ }
+ $response['openid.signed'] = implode(',', $keys_to_sign);
+ }
+
// Sign the message using the MAC key that was exchanged during association.
$association = new stdClass();
$association->mac_key = variable_get('mac_key');
- $keys_to_sign = explode(',', $response['openid.signed']);
- $response['openid.sig'] = _openid_signature($association, $response, $keys_to_sign);
+ if (!isset($response['openid.sig'])) {
+ $response['openid.sig'] = _openid_signature($association, $response, $keys_to_sign);
+ }
// Put the signed message into the query string of a URL supplied by the
// Relying Party, and redirect the user.
diff --git a/core/modules/overlay/overlay-parent.js b/core/modules/overlay/overlay-parent.js
index b406a9739ad5acfd2865237d136de53cf5ce36c4..dd7b7aeb3de85eaf47062eea2bb106fb3ba2df21 100644
--- a/core/modules/overlay/overlay-parent.js
+++ b/core/modules/overlay/overlay-parent.js
@@ -354,7 +354,7 @@ Drupal.overlay.isAdminLink = function (url) {
// Turn the list of administrative paths into a regular expression.
if (!this.adminPathRegExp) {
- var regExpPrefix = '^' + Drupal.settings.pathPrefix + '(';
+ var regExpPrefix = '' + Drupal.settings.pathPrefix + '(';
var adminPaths = regExpPrefix + Drupal.settings.overlay.paths.admin.replace(/\s+/g, ')$|' + regExpPrefix) + ')$';
var nonAdminPaths = regExpPrefix + Drupal.settings.overlay.paths.non_admin.replace(/\s+/g, ')$|'+ regExpPrefix) + ')$';
adminPaths = adminPaths.replace(/\*/g, '.*');
@@ -554,7 +554,7 @@ Drupal.overlay.eventhandlerOverrideLink = function (event) {
var target = $target[0];
var href = target.href;
// Only handle links that have an href attribute and use the http(s) protocol.
- if (href != undefined && href != '' && target.protocol.match(/^https?\:/)) {
+ if (typeof href !== 'undefined' && href !== '' && (/^https?\:/).test(target.protocol)) {
var anchor = href.replace(target.ownerDocument.location.href, '');
// Skip anchor links.
if (anchor.length == 0 || anchor.charAt(0) == '#') {
diff --git a/core/modules/path/path.module b/core/modules/path/path.module
index 9d7b2b136d69137832f13342ae250bbc791b1947..8127a912541c47a9a26d0622244045a5558c0c1a 100644
--- a/core/modules/path/path.module
+++ b/core/modules/path/path.module
@@ -97,8 +97,8 @@ function path_form_node_form_alter(&$form, $form_state) {
$path = array();
if (!empty($form['#node']->nid)) {
$conditions = array('source' => 'node/' . $form['#node']->nid);
- if ($form['#node']->language != LANGUAGE_NONE) {
- $conditions['langcode'] = $form['#node']->language;
+ if ($form['#node']->langcode != LANGUAGE_NONE) {
+ $conditions['langcode'] = $form['#node']->langcode;
}
$path = path_load($conditions);
if ($path === FALSE) {
@@ -109,7 +109,7 @@ function path_form_node_form_alter(&$form, $form_state) {
'pid' => NULL,
'source' => isset($form['#node']->nid) ? 'node/' . $form['#node']->nid : NULL,
'alias' => '',
- 'langcode' => isset($form['#node']->language) ? $form['#node']->language : LANGUAGE_NONE,
+ 'langcode' => isset($form['#node']->langcode) ? $form['#node']->langcode : LANGUAGE_NONE,
);
$form['path'] = array(
@@ -157,8 +157,8 @@ function path_form_element_validate($element, &$form_state, $complete_form) {
// originally assigned URL alias language.
// @todo Remove this after converting Path module to a field, and, after
// stopping Locale module from abusing the content language system.
- if (isset($form_state['values']['language'])) {
- form_set_value($element['langcode'], $form_state['values']['language'], $form_state);
+ if (isset($form_state['values']['langcode'])) {
+ form_set_value($element['langcode'], $form_state['values']['langcode'], $form_state);
}
$path = $form_state['values']['path'];
@@ -189,7 +189,7 @@ function path_node_insert($node) {
if (!empty($path['alias'])) {
// Ensure fields for programmatic executions.
$path['source'] = 'node/' . $node->nid;
- $path['langcode'] = isset($node->language) ? $node->language : LANGUAGE_NONE;
+ $path['langcode'] = isset($node->langcode) ? $node->langcode : LANGUAGE_NONE;
path_save($path);
}
}
@@ -210,7 +210,7 @@ function path_node_update($node) {
if (!empty($path['alias'])) {
// Ensure fields for programmatic executions.
$path['source'] = 'node/' . $node->nid;
- $path['langcode'] = isset($node->language) ? $node->language : LANGUAGE_NONE;
+ $path['langcode'] = isset($node->langcode) ? $node->langcode : LANGUAGE_NONE;
path_save($path);
}
}
diff --git a/core/modules/path/path.test b/core/modules/path/path.test
index a942a036710031cfc864b871c7e36b589b09bfe5..3072150d43404c51cd174f3f8598d07c6ec8fd0e 100644
--- a/core/modules/path/path.test
+++ b/core/modules/path/path.test
@@ -267,7 +267,7 @@ class PathLanguageTestCase extends DrupalWebTestCase {
// Edit the node to set language and path.
$edit = array();
- $edit['language'] = 'en';
+ $edit['langcode'] = 'en';
$edit['path[alias]'] = $english_alias;
$this->drupalPost('node/' . $english_node->nid . '/edit', $edit, t('Save'));
@@ -303,7 +303,7 @@ class PathLanguageTestCase extends DrupalWebTestCase {
drupal_static_reset('locale_url_outbound_alter');
drupal_static_reset('locale_language_url_rewrite_url');
$languages = language_list();
- $url = url('node/' . $french_node->nid, array('language' => $languages[$french_node->language]));
+ $url = url('node/' . $french_node->nid, array('language' => $languages[$french_node->langcode]));
$this->assertTrue(strpos($url, $edit['path[alias]']), t('URL contains the path alias.'));
// Confirm that the alias works even when changing language negotiation
@@ -353,17 +353,17 @@ class PathLanguageTestCase extends DrupalWebTestCase {
// drupal_lookup_path() has an internal static cache. Check to see that
// it has the appropriate contents at this point.
drupal_lookup_path('wipe');
- $french_node_path = drupal_lookup_path('source', $french_alias, $french_node->language);
+ $french_node_path = drupal_lookup_path('source', $french_alias, $french_node->langcode);
$this->assertEqual($french_node_path, 'node/' . $french_node->nid, t('Normal path works.'));
// Second call should return the same path.
- $french_node_path = drupal_lookup_path('source', $french_alias, $french_node->language);
+ $french_node_path = drupal_lookup_path('source', $french_alias, $french_node->langcode);
$this->assertEqual($french_node_path, 'node/' . $french_node->nid, t('Normal path is the same.'));
// Confirm that the alias works.
- $french_node_alias = drupal_lookup_path('alias', 'node/' . $french_node->nid, $french_node->language);
+ $french_node_alias = drupal_lookup_path('alias', 'node/' . $french_node->nid, $french_node->langcode);
$this->assertEqual($french_node_alias, $french_alias, t('Alias works.'));
// Second call should return the same alias.
- $french_node_alias = drupal_lookup_path('alias', 'node/' . $french_node->nid, $french_node->language);
+ $french_node_alias = drupal_lookup_path('alias', 'node/' . $french_node->nid, $french_node->langcode);
$this->assertEqual($french_node_alias, $french_alias, t('Alias is the same.'));
}
}
diff --git a/core/modules/poll/poll.test b/core/modules/poll/poll.test
index 426ffb9ddd8eb7577b8fd897591190ad9b555a2a..9275af84b7c7dc88c08ba3a402c20a1611c5f2ad 100644
--- a/core/modules/poll/poll.test
+++ b/core/modules/poll/poll.test
@@ -855,7 +855,7 @@ class PollTranslateTestCase extends PollTestCase {
// Set the poll's first choice count to 200.
$edit['choice[chid:1][chvotes]'] = 200;
// Set the language to Dutch.
- $edit['language'] = 'nl';
+ $edit['langcode'] = 'nl';
$this->drupalPost(NULL, $edit, t('Save'));
// Translate the Dutch poll.
diff --git a/core/modules/simpletest/drupal_web_test_case.php b/core/modules/simpletest/drupal_web_test_case.php
index e7045f8646514b0227504213454480433cfecfa0..61e54df193d18611216740de99339536f1880764 100644
--- a/core/modules/simpletest/drupal_web_test_case.php
+++ b/core/modules/simpletest/drupal_web_test_case.php
@@ -932,7 +932,7 @@ protected function drupalCreateNode($settings = array()) {
'sticky' => 0,
'type' => 'page',
'revisions' => NULL,
- 'language' => LANGUAGE_NONE,
+ 'langcode' => LANGUAGE_NONE,
);
// Use the original node's created time for existing nodes.
@@ -957,7 +957,7 @@ protected function drupalCreateNode($settings = array()) {
'value' => $this->randomName(32),
'format' => filter_default_format(),
);
- $settings['body'][$settings['language']][0] += $body;
+ $settings['body'][$settings['langcode']][0] += $body;
$node = (object) $settings;
node_save($node);
@@ -2097,6 +2097,8 @@ protected function drupalPostAJAX($path, $edit, $triggering_element, $ajax_path
// them.
$dom = new DOMDocument();
@$dom->loadHTML($content);
+ // XPath allows for finding wrapper nodes better than DOM does.
+ $xpath = new DOMXPath($dom);
foreach ($return as $command) {
switch ($command['command']) {
case 'settings':
@@ -2104,52 +2106,52 @@ protected function drupalPostAJAX($path, $edit, $triggering_element, $ajax_path
break;
case 'insert':
- // @todo ajax.js can process commands that include a 'selector', but
- // these are hard to emulate with DOMDocument. For now, we only
- // implement 'insert' commands that use $ajax_settings['wrapper'].
+ $wrapperNode = NULL;
+ // When a command doesn't specify a selector, use the
+ // #ajax['wrapper'] which is always an HTML ID.
if (!isset($command['selector'])) {
- // $dom->getElementById() doesn't work when drupalPostAJAX() is
- // invoked multiple times for a page, so use XPath instead. This
- // also sets us up for adding support for $command['selector'] in
- // the future, once we figure out how to transform a jQuery
- // selector to XPath.
- $xpath = new DOMXPath($dom);
$wrapperNode = $xpath->query('//*[@id="' . $ajax_settings['wrapper'] . '"]')->item(0);
- if ($wrapperNode) {
- // ajax.js adds an enclosing DIV to work around a Safari bug.
- $newDom = new DOMDocument();
- $newDom->loadHTML('<div>' . $command['data'] . '</div>');
- $newNode = $dom->importNode($newDom->documentElement->firstChild->firstChild, TRUE);
- $method = isset($command['method']) ? $command['method'] : $ajax_settings['method'];
- // The "method" is a jQuery DOM manipulation function. Emulate
- // each one using PHP's DOMNode API.
- switch ($method) {
- case 'replaceWith':
- $wrapperNode->parentNode->replaceChild($newNode, $wrapperNode);
- break;
- case 'append':
- $wrapperNode->appendChild($newNode);
- break;
- case 'prepend':
- // If no firstChild, insertBefore() falls back to
- // appendChild().
- $wrapperNode->insertBefore($newNode, $wrapperNode->firstChild);
- break;
- case 'before':
- $wrapperNode->parentNode->insertBefore($newNode, $wrapperNode);
- break;
- case 'after':
- // If no nextSibling, insertBefore() falls back to
- // appendChild().
- $wrapperNode->parentNode->insertBefore($newNode, $wrapperNode->nextSibling);
- break;
- case 'html':
- foreach ($wrapperNode->childNodes as $childNode) {
- $wrapperNode->removeChild($childNode);
- }
- $wrapperNode->appendChild($newNode);
- break;
- }
+ }
+ // @todo Ajax commands can target any jQuery selector, but these are
+ // hard to fully emulate with XPath. For now, just handle 'head'
+ // and 'body', since these are used by ajax_render().
+ elseif (in_array($command['selector'], array('head', 'body'))) {
+ $wrapperNode = $xpath->query('//' . $command['selector'])->item(0);
+ }
+ if ($wrapperNode) {
+ // ajax.js adds an enclosing DIV to work around a Safari bug.
+ $newDom = new DOMDocument();
+ $newDom->loadHTML('<div>' . $command['data'] . '</div>');
+ $newNode = $dom->importNode($newDom->documentElement->firstChild->firstChild, TRUE);
+ $method = isset($command['method']) ? $command['method'] : $ajax_settings['method'];
+ // The "method" is a jQuery DOM manipulation function. Emulate
+ // each one using PHP's DOMNode API.
+ switch ($method) {
+ case 'replaceWith':
+ $wrapperNode->parentNode->replaceChild($newNode, $wrapperNode);
+ break;
+ case 'append':
+ $wrapperNode->appendChild($newNode);
+ break;
+ case 'prepend':
+ // If no firstChild, insertBefore() falls back to
+ // appendChild().
+ $wrapperNode->insertBefore($newNode, $wrapperNode->firstChild);
+ break;
+ case 'before':
+ $wrapperNode->parentNode->insertBefore($newNode, $wrapperNode);
+ break;
+ case 'after':
+ // If no nextSibling, insertBefore() falls back to
+ // appendChild().
+ $wrapperNode->parentNode->insertBefore($newNode, $wrapperNode->nextSibling);
+ break;
+ case 'html':
+ foreach ($wrapperNode->childNodes as $childNode) {
+ $wrapperNode->removeChild($childNode);
+ }
+ $wrapperNode->appendChild($newNode);
+ break;
}
}
break;
diff --git a/core/modules/simpletest/tests/ajax.test b/core/modules/simpletest/tests/ajax.test
index 8e731b8e7c6cc8035661abd6949f0b1f2c33c024..014a350421a49533c8c944677c70ea59562cddee 100644
--- a/core/modules/simpletest/tests/ajax.test
+++ b/core/modules/simpletest/tests/ajax.test
@@ -195,6 +195,27 @@ class AJAXFrameworkTestCase extends AJAXTestCase {
$this->assertEqual($new_js, $original_js + array($expected['js'] => 1), t('Page state now has the %js file.', array('%js' => $expected['js'])));
$this->assertCommand($commands, array('data' => $expected_js_html), t('Page now has the %js file.', array('%js' => $expected['js'])));
}
+
+ /**
+ * Tests that overridden CSS files are not added during lazy load.
+ */
+ function testLazyLoadOverriddenCSS() {
+ // The test theme overrides system.base.css without an implementation,
+ // thereby removing it.
+ theme_enable(array('test_theme'));
+ variable_set('theme_default', 'test_theme');
+
+ // This gets the form, and emulates an Ajax submission on it, including
+ // adding markup to the HEAD and BODY for any lazy loaded JS/CSS files.
+ $this->drupalPostAJAX('ajax_forms_test_lazy_load_form', array('add_files' => TRUE), array('op' => t('Submit')));
+
+ // Verify that the resulting HTML does not load the overridden CSS file.
+ // We add a "?" to the assertion, because Drupal.settings may include
+ // information about the file; we only really care about whether it appears
+ // in a LINK or STYLE tag, for which Drupal always adds a query string for
+ // cache control.
+ $this->assertNoText('system.base.css?', 'Ajax lazy loading does not add overridden CSS files.');
+ }
}
/**
diff --git a/core/modules/simpletest/tests/ajax_test.module b/core/modules/simpletest/tests/ajax_test.module
index 4148a0839fb93dfcac3fe696a9d97dee826e38bf..21be019422ad25dc424473f68458df2d2eac6109 100644
--- a/core/modules/simpletest/tests/ajax_test.module
+++ b/core/modules/simpletest/tests/ajax_test.module
@@ -31,6 +31,14 @@ function ajax_test_menu() {
return $items;
}
+/**
+ * Implements hook_system_theme_info().
+ */
+function ajax_test_system_theme_info() {
+ $themes['test_theme'] = drupal_get_path('module', 'ajax_test') . '/themes/test_theme/test_theme.info';
+ return $themes;
+}
+
/**
* Menu callback; Return an element suitable for use by ajax_deliver().
*
diff --git a/core/modules/simpletest/tests/form_test.module b/core/modules/simpletest/tests/form_test.module
index e1e2435fc3cbfb697d228c8616f769523ec3590f..a2f1290cbf0c4560fa8772e6b130c4ed8fecfd30 100644
--- a/core/modules/simpletest/tests/form_test.module
+++ b/core/modules/simpletest/tests/form_test.module
@@ -1617,7 +1617,7 @@ function form_test_two_instances() {
'uid' => $user->uid,
'name' => (isset($user->name) ? $user->name : ''),
'type' => 'page',
- 'language' => LANGUAGE_NONE,
+ 'langcode' => LANGUAGE_NONE,
);
$node2 = clone($node1);
$return['node_form_1'] = drupal_get_form('page_node_form', $node1);
diff --git a/core/modules/simpletest/tests/theme.test b/core/modules/simpletest/tests/theme.test
index 0ed109df7d43b36ed3ccfa5a12ad481e05260407..a795054c5d6b05edafc253c3cbfc061a63033cbb 100644
--- a/core/modules/simpletest/tests/theme.test
+++ b/core/modules/simpletest/tests/theme.test
@@ -52,11 +52,19 @@ class ThemeUnitTest extends DrupalWebTestCase {
}
/**
- * Preprocess functions for the base hook should run even for suggestion implementations.
- */
+ * Ensures preprocess functions run even for suggestion implementations.
+ *
+ * The theme hook used by this test has its base preprocess function in a
+ * separate file, so this test also ensures that that file is correctly loaded
+ * when needed.
+ */
function testPreprocessForSuggestions() {
- $this->drupalGet('theme-test/suggestion');
- $this->assertText('test_theme_breadcrumb__suggestion: 1', t('Theme hook suggestion ran with data available from a preprocess function for the base hook.'));
+ // Test with both an unprimed and primed theme registry.
+ drupal_theme_rebuild();
+ for ($i = 0; $i < 2; $i++) {
+ $this->drupalGet('theme-test/suggestion');
+ $this->assertText('Theme hook implementor=test_theme_theme_test__suggestion(). Foo=template_preprocess_theme_test', 'Theme hook suggestion ran with data available from a preprocess function for the base hook.');
+ }
}
/**
diff --git a/core/modules/simpletest/tests/theme_test.inc b/core/modules/simpletest/tests/theme_test.inc
new file mode 100644
index 0000000000000000000000000000000000000000..6cde68384fa5240636bc0e049dbb216fece61a21
--- /dev/null
+++ b/core/modules/simpletest/tests/theme_test.inc
@@ -0,0 +1,15 @@
+<?php
+
+/**
+ * Returns HTML for the 'theme_test' theme hook used by tests.
+ */
+function theme_theme_test($variables) {
+ return 'Theme hook implementor=theme_theme_test(). Foo=' . $variables['foo'];
+}
+
+/**
+ * Preprocesses variables for theme_theme_test().
+ */
+function template_preprocess_theme_test(&$variables) {
+ $variables['foo'] = 'template_preprocess_theme_test';
+}
diff --git a/core/modules/simpletest/tests/theme_test.module b/core/modules/simpletest/tests/theme_test.module
index 365fd873a5b8befdaa9e64fbe6c1443cbcd6860e..f6065f22497d1ab348ba9f80a0859fe353736568 100644
--- a/core/modules/simpletest/tests/theme_test.module
+++ b/core/modules/simpletest/tests/theme_test.module
@@ -4,13 +4,16 @@
* Implements hook_theme().
*/
function theme_test_theme($existing, $type, $theme, $path) {
+ $items['theme_test'] = array(
+ 'file' => 'theme_test.inc',
+ 'variables' => array('foo' => ''),
+ );
$items['theme_test_template_test'] = array(
'template' => 'theme_test.template_test',
);
$items['theme_test_template_test_2'] = array(
'template' => 'theme_test.template_test',
);
-
return $items;
}
@@ -129,16 +132,7 @@ function _theme_test_alter() {
* Page callback, calls a theme hook suggestion.
*/
function _theme_test_suggestion() {
- return theme(array('breadcrumb__suggestion', 'breadcrumb'), array());
-}
-
-/**
- * Implements hook_preprocess_breadcrumb().
- *
- * Set a variable that can later be tested to see if this function ran.
- */
-function theme_test_preprocess_breadcrumb(&$variables) {
- $variables['theme_test_preprocess_breadcrumb'] = 1;
+ return theme(array('theme_test__suggestion', 'theme_test'), array());
}
/**
diff --git a/core/modules/simpletest/tests/themes/test_theme/template.php b/core/modules/simpletest/tests/themes/test_theme/template.php
index ef8118a6da947674484fef05351ce9dd3cf03769..8275818e45342a9653611f56b1ca6665867cfba3 100644
--- a/core/modules/simpletest/tests/themes/test_theme/template.php
+++ b/core/modules/simpletest/tests/themes/test_theme/template.php
@@ -3,10 +3,8 @@
/**
* Tests a theme overriding a suggestion of a base theme hook.
*/
-function test_theme_breadcrumb__suggestion($variables) {
- // Tests that preprocess functions for the base theme hook get called even
- // when the suggestion has an implementation.
- return 'test_theme_breadcrumb__suggestion: ' . $variables['theme_test_preprocess_breadcrumb'];
+function test_theme_theme_test__suggestion($variables) {
+ return 'Theme hook implementor=test_theme_theme_test__suggestion(). Foo=' . $variables['foo'];
}
/**
diff --git a/core/modules/simpletest/tests/upgrade/drupal-7.language.database.php b/core/modules/simpletest/tests/upgrade/drupal-7.language.database.php
index dead98cf303e01865384e09ea499dc1a8cc9b593..c231f84e23ac50258e665bd9e5c305a3aba711e4 100644
--- a/core/modules/simpletest/tests/upgrade/drupal-7.language.database.php
+++ b/core/modules/simpletest/tests/upgrade/drupal-7.language.database.php
@@ -512,11 +512,11 @@
))
->values(array(
'name' => 'language_content_type_article',
- 'value' => 's:1:"1";',
+ 'value' => 's:1:"2";',
))
->execute();
-// Enable the locale module.
+// Enable Locale and Translation module.
db_update('system')->fields(array(
'status' => 1,
'schema_version' => '7001',
@@ -524,8 +524,20 @@
->condition('type', 'module')
->condition('name', 'locale')
->execute();
+db_update('system')->fields(array(
+ 'status' => 1,
+ 'schema_version' => '7001',
+))
+->condition('type', 'module')
+->condition('name', 'translation')
+->execute();
-// Add a sample node to test comments on.
+// Add sample nodes to test language assignment and translation functionality.
+// The first node is also used for testing comment language functionality. This
+// is a simple node with LANGUAGE_NONE as language code. The second node is a
+// Catalan node (language code 'ca'). The third and fourth node are a
+// translation set with an English source translation (language code 'en') and a
+// Chuvash translation (language code 'cv').
db_insert('node')->fields(array(
'nid',
'vid',
@@ -558,9 +570,57 @@
'tnid' => '0',
'translate' => '0',
))
+->values(array(
+ 'nid' => '39',
+ 'vid' => '55',
+ 'type' => 'article',
+ 'language' => 'ca',
+ 'title' => 'Node title 39',
+ 'uid' => '6',
+ 'status' => '1',
+ 'created' => '1263769300',
+ 'changed' => '1263769300',
+ 'comment' => '0',
+ 'promote' => '0',
+ 'sticky' => '0',
+ 'tnid' => '0',
+ 'translate' => '0',
+))
+->values(array(
+ 'nid' => '40',
+ 'vid' => '60',
+ 'type' => 'article',
+ 'language' => 'en',
+ 'title' => 'Node title 40',
+ 'uid' => '6',
+ 'status' => '1',
+ 'created' => '1263769534',
+ 'changed' => '1263769534',
+ 'comment' => '0',
+ 'promote' => '0',
+ 'sticky' => '0',
+ 'tnid' => '40',
+ 'translate' => '0',
+))
+->values(array(
+ 'nid' => '41',
+ 'vid' => '65',
+ 'type' => 'article',
+ 'language' => 'cv',
+ 'title' => 'Node title 41',
+ 'uid' => '6',
+ 'status' => '1',
+ 'created' => '1263770064',
+ 'changed' => '1263770064',
+ 'comment' => '0',
+ 'promote' => '0',
+ 'sticky' => '0',
+ 'tnid' => '40',
+ 'translate' => '0',
+))
->execute();
-// Add its node comment statistics.
+// Add node comment statistics for the first node.
db_insert('node_comment_statistics')->fields(array(
'nid',
'cid',
@@ -597,13 +657,49 @@
'vid' => '50',
'uid' => '6',
'title' => 'Node title 38',
- 'log' => 'added a node to comment on',
+ 'log' => 'Added a LANGUAGE_NONE node to comment on.',
'timestamp' => '1314997642',
'status' => '1',
'comment' => '2',
'promote' => '0',
'sticky' => '0',
))
+->values(array(
+ 'nid' => '39',
+ 'vid' => '55',
+ 'uid' => '6',
+ 'title' => 'Node title 39',
+ 'log' => 'Created a Catalan node.',
+ 'timestamp' => '1263769300',
+ 'status' => '1',
+ 'comment' => '0',
+ 'promote' => '0',
+ 'sticky' => '0',
+))
+->values(array(
+ 'nid' => '40',
+ 'vid' => '60',
+ 'uid' => '6',
+ 'title' => 'Node title 40',
+ 'log' => 'Created source translation in English.',
+ 'timestamp' => '1263769534',
+ 'status' => '1',
+ 'comment' => '0',
+ 'promote' => '0',
+ 'sticky' => '0',
+))
+->values(array(
+ 'nid' => '41',
+ 'vid' => '65',
+ 'uid' => '6',
+ 'title' => 'Node title 41',
+ 'log' => 'Created Chuvash translation.',
+ 'timestamp' => '1263770064',
+ 'status' => '1',
+ 'comment' => '0',
+ 'promote' => '0',
+ 'sticky' => '0',
+))
->execute();
// Add the body field value.
@@ -660,7 +756,7 @@
))
->execute();
-// Add two comments to this node in a thread.
+// Add two comments to the first node in a thread.
db_insert('comment')->fields(array(
'cid',
'pid',
diff --git a/core/modules/simpletest/tests/upgrade/upgrade.language.test b/core/modules/simpletest/tests/upgrade/upgrade.language.test
index 48443d16190c0eb1b63e216e178c309f79f88e39..b132e1077a1bd1109fa41f4f249229c0953427e6 100644
--- a/core/modules/simpletest/tests/upgrade/upgrade.language.test
+++ b/core/modules/simpletest/tests/upgrade/upgrade.language.test
@@ -56,10 +56,26 @@ class LanguageUpgradePathTestCase extends UpgradePathTestCase {
// language negotiation settings are not properly upgraded.
$this->assertTrue($this->xpath('//div[@id="block-locale-language-interface"]'), t('The language switcher block is being correctly showed.'));
+ // Test that the 'language' property was properly renamed to 'langcode'.
+ $language_none_nid = 38;
+ $spanish_nid = 39;
+ $translation_source_nid = 40;
+ $translation_nid = 41;
+ // Check directly for the $node->langcode property.
+ $this->assertEqual(node_load($language_none_nid)->langcode, LANGUAGE_NONE, "'language' property was renamed to 'langcode' for LANGUAGE_NONE node.");
+ $this->assertEqual(node_load($spanish_nid)->langcode, 'ca', "'language' property was renamed to 'langcode' for Catalan node.");
+ // Check that the translation table works correctly.
+ $this->drupalGet("node/$translation_source_nid/translate");
+ $this->assertResponse(200, 'The translated node has a proper translation table.');
+ $this->assertRaw('<td><strong>English</strong> (source)</td>', 'English is the source node of the translation.');
+ $this->assertRaw('<td>Chuvash</td>', 'There is a Chuvash translation of the node.');
+ $this->assertLinkByHref("node/$translation_nid", 0, 'The translation table links to the Chuvash translation.');
+ $this->assertRaw('<td>Catalan</td><td>n/a</td><td>Not translated</td>', 'There is no Catalan translation of this node.');
+
// Check for node content type settings upgrade.
$this->drupalGet('node/add/article');
- $this->assertFieldByName('language');
+ $this->assertFieldByName('langcode');
$this->drupalGet('node/add/page');
- $this->assertNoFieldByName('language');
+ $this->assertNoFieldByName('langcode');
}
}
diff --git a/core/modules/system/system.base-rtl.css b/core/modules/system/system.base-rtl.css
index c148995193911a319466a7f9504d41fcd53d5513..d01792e09c57cb312a732f876481afb5601a1d2c 100644
--- a/core/modules/system/system.base-rtl.css
+++ b/core/modules/system/system.base-rtl.css
@@ -33,8 +33,12 @@
*/
.draggable a.tabledrag-handle {
float: right;
- margin: -0.4em -0.5em -0.4em 0;
- padding: 0.42em 0.5em 0.42em 1.5em;
+ margin-right: -1em;
+ margin-left: 0;
+}
+a.tabledrag-handle .handle {
+ margin: -0.4em 0.5em;
+ padding: 0.42em 0.5em;
}
div.indentation {
float: right;
diff --git a/core/modules/system/system.base.css b/core/modules/system/system.base.css
index 2fe1cba3c1323d89869ccf5786b333cf830c37f3..1723b33501d84de45ba98d211fd3061789c19a27 100644
--- a/core/modules/system/system.base.css
+++ b/core/modules/system/system.base.css
@@ -93,21 +93,22 @@ body.drag {
cursor: move;
float: left; /* LTR */
height: 1.7em;
- margin: -0.4em 0 -0.4em -0.5em; /* LTR */
- padding: 0.42em 1.5em 0.42em 0.5em; /* LTR */
+ margin-left: -1em; /* LTR */
+ overflow: hidden;
text-decoration: none;
}
a.tabledrag-handle:hover {
text-decoration: none;
}
a.tabledrag-handle .handle {
- background: url(../../misc/draggable.png) no-repeat 0 0;
+ background: url(../../misc/draggable.png) no-repeat 6px 9px;
height: 13px;
- margin-top: 4px;
+ margin: -0.4em 0.5em; /* LTR */
+ padding: 0.42em 0.5em; /* LTR */
width: 13px;
}
a.tabledrag-handle-hover .handle {
- background-position: 0 -20px;
+ background-position: 6px -11px;
}
div.indentation {
float: left; /* LTR */
diff --git a/core/modules/taxonomy/taxonomy.module b/core/modules/taxonomy/taxonomy.module
index 3a9258bb16b9641ed1ae8c82e729eff575ab50eb..eac6bed3fb250e621a5870945319aca25881aabb 100644
--- a/core/modules/taxonomy/taxonomy.module
+++ b/core/modules/taxonomy/taxonomy.module
@@ -525,6 +525,30 @@ function taxonomy_vocabulary_delete($vid) {
module_invoke_all('taxonomy_vocabulary_delete', $vocabulary);
module_invoke_all('entity_delete', $vocabulary, 'taxonomy_vocabulary');
+ // Load all Taxonomy module fields and delete those which use only this
+ // vocabulary.
+ $taxonomy_fields = field_read_fields(array('module' => 'taxonomy'));
+ foreach ($taxonomy_fields as $field_name => $taxonomy_field) {
+ $modified_field = FALSE;
+ // Term reference fields may reference terms from more than one
+ // vocabulary.
+ foreach ($taxonomy_field['settings']['allowed_values'] as $key => $allowed_value) {
+ if ($allowed_value['vocabulary'] == $vocabulary->machine_name) {
+ unset($taxonomy_field['settings']['allowed_values'][$key]);
+ $modified_field = TRUE;
+ }
+ }
+ if ($modified_field) {
+ if (empty($taxonomy_field['settings']['allowed_values'])) {
+ field_delete_field($field_name);
+ }
+ else {
+ // Update the field definition with the new allowed values.
+ field_update_field($taxonomy_field);
+ }
+ }
+ }
+
cache_clear_all();
taxonomy_vocabulary_static_reset();
diff --git a/core/modules/taxonomy/taxonomy.test b/core/modules/taxonomy/taxonomy.test
index 6494e590cfa923458c91986c25e8eaa2a0848427..b262b86ed18223b3c92216211372d2704b2e6e38 100644
--- a/core/modules/taxonomy/taxonomy.test
+++ b/core/modules/taxonomy/taxonomy.test
@@ -1474,6 +1474,11 @@ class TaxonomyTermFieldTestCase extends TaxonomyWebTestCase {
$entity->content = field_attach_view('test_entity', $entity, 'full');
$this->content = drupal_render($entity->content);
$this->assertText($term->name, t('Term name is displayed'));
+
+ // Delete the vocabulary and verify that the widget is gone.
+ taxonomy_vocabulary_delete($this->vocabulary->vid);
+ $this->drupalGet('test-entity/add/test-bundle');
+ $this->assertNoFieldByName("{$this->field_name}[$langcode]", '', 'Widget is not displayed');
}
/**
@@ -1511,6 +1516,127 @@ class TaxonomyTermFieldTestCase extends TaxonomyWebTestCase {
}
}
+/**
+ * Tests a taxonomy term reference field that allows multiple vocabularies.
+ */
+class TaxonomyTermFieldMultipleVocabularyTestCase extends TaxonomyWebTestCase {
+ protected $instance;
+ protected $vocabulary1;
+ protected $vocabulary2;
+
+ public static function getInfo() {
+ return array(
+ 'name' => 'Multiple vocabulary term reference field',
+ 'description' => 'Tests term reference fields that allow multiple vocabularies.',
+ 'group' => 'Taxonomy',
+ );
+ }
+
+ function setUp() {
+ parent::setUp('field_test');
+
+ $web_user = $this->drupalCreateUser(array('access field_test content', 'administer field_test content', 'administer taxonomy'));
+ $this->drupalLogin($web_user);
+ $this->vocabulary1 = $this->createVocabulary();
+ $this->vocabulary2 = $this->createVocabulary();
+
+ // Set up a field and instance.
+ $this->field_name = drupal_strtolower($this->randomName());
+ $this->field = array(
+ 'field_name' => $this->field_name,
+ 'type' => 'taxonomy_term_reference',
+ 'cardinality' => FIELD_CARDINALITY_UNLIMITED,
+ 'settings' => array(
+ 'allowed_values' => array(
+ array(
+ 'vocabulary' => $this->vocabulary1->machine_name,
+ 'parent' => '0',
+ ),
+ array(
+ 'vocabulary' => $this->vocabulary2->machine_name,
+ 'parent' => '0',
+ ),
+ ),
+ )
+ );
+ field_create_field($this->field);
+ $this->instance = array(
+ 'field_name' => $this->field_name,
+ 'entity_type' => 'test_entity',
+ 'bundle' => 'test_bundle',
+ 'widget' => array(
+ 'type' => 'options_select',
+ ),
+ 'display' => array(
+ 'full' => array(
+ 'type' => 'taxonomy_term_reference_link',
+ ),
+ ),
+ );
+ field_create_instance($this->instance);
+ }
+
+ /**
+ * Tests term reference field and widget with multiple vocabularies.
+ */
+ function testTaxonomyTermFieldMultipleVocabularies() {
+ // Create a term in each vocabulary.
+ $term1 = $this->createTerm($this->vocabulary1);
+ $term2 = $this->createTerm($this->vocabulary2);
+
+ // Submit an entity with both terms.
+ $langcode = LANGUAGE_NONE;
+ $this->drupalGet('test-entity/add/test-bundle');
+ $this->assertFieldByName("{$this->field_name}[$langcode][]", '', 'Widget is displayed');
+ $edit = array(
+ "{$this->field_name}[$langcode][]" => array($term1->tid, $term2->tid),
+ );
+ $this->drupalPost(NULL, $edit, t('Save'));
+ preg_match('|test-entity/manage/(\d+)/edit|', $this->url, $match);
+ $id = $match[1];
+ $this->assertRaw(t('test_entity @id has been created.', array('@id' => $id)), 'Entity was created.');
+
+ // Render the entity.
+ $entity = field_test_entity_test_load($id);
+ $entities = array($id => $entity);
+ field_attach_prepare_view('test_entity', $entities, 'full');
+ $entity->content = field_attach_view('test_entity', $entity, 'full');
+ $this->content = drupal_render($entity->content);
+ $this->assertText($term1->name, 'Term 1 name is displayed.');
+ $this->assertText($term2->name, 'Term 2 name is displayed.');
+
+ // Delete vocabulary 2.
+ taxonomy_vocabulary_delete($this->vocabulary2->vid);
+
+ // Re-render the content.
+ $entity = field_test_entity_test_load($id);
+ $entities = array($id => $entity);
+ field_attach_prepare_view('test_entity', $entities, 'full');
+ $entity->content = field_attach_view('test_entity', $entity, 'full');
+ $this->plainTextContent = FALSE;
+ $this->content = drupal_render($entity->content);
+
+ // Term 1 should still be displayed; term 2 should not be.
+ $this->assertText($term1->name, 'Term 1 name is displayed.');
+ $this->assertNoText($term2->name, 'Term 2 name is not displayed.');
+
+ // Verify that field and instance settings are correct.
+ $field_info = field_info_field($this->field_name);
+ $this->assertTrue(sizeof($field_info['settings']['allowed_values']) == 1, 'Only one vocabulary is allowed for the field.');
+
+ // The widget should still be displayed.
+ $this->drupalGet('test-entity/add/test-bundle');
+ $this->assertFieldByName("{$this->field_name}[$langcode][]", '', 'Widget is still displayed');
+
+ // Term 1 should still pass validation.
+ $edit = array(
+ "{$this->field_name}[$langcode][]" => array($term1->tid),
+ );
+ $this->drupalPost(NULL, $edit, t('Save'));
+ }
+}
+
+
/**
* Test taxonomy token replacement in strings.
*/
diff --git a/core/modules/translation/translation.module b/core/modules/translation/translation.module
index 2b2a6ffb623d6bc0791232267e2836d72884d61e..e1de320be8b7e28d504e26ea568107debe219ab2 100644
--- a/core/modules/translation/translation.module
+++ b/core/modules/translation/translation.module
@@ -77,7 +77,7 @@ function translation_menu() {
* all languages).
*/
function _translation_tab_access($node) {
- if ($node->language != LANGUAGE_NONE && translation_supported_type($node->type) && node_access('view', $node)) {
+ if ($node->langcode != LANGUAGE_NONE && translation_supported_type($node->type) && node_access('view', $node)) {
return user_access('translate content');
}
return FALSE;
@@ -147,26 +147,26 @@ function translation_form_node_form_alter(&$form, &$form_state) {
$options[$group][$langcode] = $language->name;
}
}
- $form['language']['#options'] = $options;
+ $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);
- $form['language']['#disabled'] = TRUE;
+ $form['langcode']['#disabled'] = TRUE;
}
elseif (!empty($node->nid) && !empty($node->tnid)) {
// Disable languages for existing translations, so it is not possible to switch this
// node to some language which is already in the translation set. Also remove the
// language neutral option.
- unset($form['language']['#options'][LANGUAGE_NONE]);
+ unset($form['langcode']['#options'][LANGUAGE_NONE]);
foreach (translation_node_get_translations($node->tnid) as $langcode => $translation) {
if ($translation->nid != $node->nid) {
if ($translator_widget) {
$group = $groups[(int)!isset($disabled_languages[$langcode])];
- unset($form['language']['#options'][$group][$langcode]);
+ unset($form['langcode']['#options'][$group][$langcode]);
}
else {
- unset($form['language']['#options'][$langcode]);
+ unset($form['langcode']['#options'][$langcode]);
}
}
}
@@ -229,7 +229,7 @@ function translation_node_view($node, $view_mode) {
foreach ($translations as $langcode => $translation) {
// 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->language) {
+ if ($translation->status && isset($languages[$langcode]) && $langcode != $node->langcode) {
$language = $languages[$langcode];
$key = "translation_$langcode";
@@ -288,7 +288,7 @@ function translation_node_prepare($node) {
$language_list = language_list();
$langcode = $_GET['target'];
- if (!isset($language_list[$langcode]) || ($source_node->language == $langcode)) {
+ if (!isset($language_list[$langcode]) || ($source_node->langcode == $langcode)) {
// If not supported language, or same language as source node, break.
return;
}
@@ -303,13 +303,13 @@ function translation_node_prepare($node) {
}
// Populate fields based on source node.
- $node->language = $langcode;
+ $node->langcode = $langcode;
$node->translation_source = $source_node;
$node->title = $source_node->title;
// Add field translations and let other modules module add custom translated
// fields.
- field_attach_prepare_translation('node', $node, $node->language, $source_node, $source_node->language);
+ field_attach_prepare_translation('node', $node, $node->langcode, $source_node, $source_node->langcode);
}
}
@@ -354,7 +354,7 @@ function translation_node_insert($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->language) && $node->tnid) {
+ if (isset($node->translation) && $node->translation && !empty($node->langcode) && $node->tnid) {
// Update translation information.
db_update('node')
->fields(array(
@@ -385,8 +385,8 @@ function translation_node_validate($node, $form) {
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;
$translations = translation_node_get_translations($tnid);
- if (isset($translations[$node->language]) && $translations[$node->language]->nid != $node->nid ) {
- form_set_error('language', t('There is already a translation in this language.'));
+ if (isset($translations[$node->langcode]) && $translations[$node->langcode]->nid != $node->nid ) {
+ form_set_error('langcode', t('There is already a translation in this language.'));
}
}
}
@@ -443,7 +443,7 @@ function translation_remove_from_set($node) {
* The translation source nid of the translation set, the identifier
* of the node used to derive all translations in the set.
* @return
- * Array of partial node objects (nid, title, language) representing
+ * Array of partial node objects (nid, title, langcode) representing
* all nodes in the translation set, in effect all translations
* of node $tnid, including node $tnid itself. Because these are
* partial nodes, you need to node_load() the full node, if you
@@ -456,13 +456,13 @@ function translation_node_get_translations($tnid) {
if (!isset($translations[$tnid])) {
$translations[$tnid] = array();
$result = db_select('node', 'n')
- ->fields('n', array('nid', 'type', 'uid', 'status', 'title', 'language'))
+ ->fields('n', array('nid', 'type', 'uid', 'status', 'title', 'langcode'))
->condition('n.tnid', $tnid)
->addTag('node_access')
->execute();
foreach ($result as $node) {
- $translations[$tnid][$node->language] = $node;
+ $translations[$tnid][$node->langcode] = $node;
}
}
return $translations[$tnid];
@@ -516,10 +516,10 @@ function translation_language_switch_links_alter(array &$links, $type, $path) {
// have translations it might be a language neutral node, in which case we
// must leave the language switch links unaltered. This is true also for
// nodes not having translation support enabled.
- if (empty($node) || $node->language == LANGUAGE_NONE || !translation_supported_type($node->type)) {
+ if (empty($node) || $node->langcode == LANGUAGE_NONE || !translation_supported_type($node->type)) {
return;
}
- $translations = array($node->language => $node);
+ $translations = array($node->langcode => $node);
}
else {
$translations = translation_node_get_translations($node->tnid);
diff --git a/core/modules/translation/translation.pages.inc b/core/modules/translation/translation.pages.inc
index 8c09850adc53d86ad39a088cac6a5b220837ead0..fd69d343d521dd1dd0d3c1576094569b640bdfbc 100644
--- a/core/modules/translation/translation.pages.inc
+++ b/core/modules/translation/translation.pages.inc
@@ -22,7 +22,7 @@ function translation_node_overview($node) {
else {
// We have no translation source nid, this could be a new set, emulate that.
$tnid = $node->nid;
- $translations = array($node->language => $node);
+ $translations = array($node->langcode => $node);
}
$type = variable_get('translation_language_type', LANGUAGE_TYPE_INTERFACE);
diff --git a/core/modules/translation/translation.test b/core/modules/translation/translation.test
index 4dec2c59264e999a2be1b6ead2b3c26d6f07e4a0..2a77c03090e3a8dc540110b099a5a0d149d6abc5 100644
--- a/core/modules/translation/translation.test
+++ b/core/modules/translation/translation.test
@@ -62,7 +62,6 @@ class TranslationTestCase extends DrupalWebTestCase {
$node_title = $this->randomName();
$node_body = $this->randomName();
$node = $this->createPage($node_title, $node_body, 'en');
-
// Unpublish the original node to check that this has no impact on the
// translation overview page, publish it again afterwards.
$this->drupalLogin($this->admin_user);
@@ -126,14 +125,14 @@ class TranslationTestCase extends DrupalWebTestCase {
// Confirm that disabled languages are an option for translators when
// creating nodes.
$this->drupalGet('node/add/page');
- $this->assertFieldByXPath('//select[@name="language"]//option', 'it', t('Italian (disabled) is available in language selection.'));
+ $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_NONE][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');
- $this->assertFieldByXPath('//select[@name="language"]//option', LANGUAGE_NONE, t('Language neutral is available in language selection with disabled languages.'));
+ $this->assertFieldByXPath('//select[@name="langcode"]//option', LANGUAGE_NONE, t('Language neutral is available in language selection with disabled languages.'));
$node2 = $this->createPage($this->randomName(), $this->randomName(), LANGUAGE_NONE);
$this->assertRaw($node2->body[LANGUAGE_NONE][0]['value'], t('Language neutral content created with disabled languages available.'));
@@ -221,9 +220,9 @@ class TranslationTestCase extends DrupalWebTestCase {
// Create a language neutral node and check that the language switcher is
// left untouched.
$node2 = $this->createPage($this->randomName(), $this->randomName(), LANGUAGE_NONE);
- $node2_en = (object) array('nid' => $node2->nid, 'language' => 'en');
- $node2_es = (object) array('nid' => $node2->nid, 'language' => 'es');
- $node2_it = (object) array('nid' => $node2->nid, 'language' => 'it');
+ $node2_en = (object) array('nid' => $node2->nid, 'langcode' => 'en');
+ $node2_es = (object) array('nid' => $node2->nid, 'langcode' => 'es');
+ $node2_it = (object) array('nid' => $node2->nid, 'langcode' => 'it');
$this->assertLanguageSwitchLinks($node2_en, $node2_en, TRUE, $type);
$this->assertLanguageSwitchLinks($node2_en, $node2_es, TRUE, $type);
$this->assertLanguageSwitchLinks($node2_en, $node2_it, TRUE, $type);
@@ -244,8 +243,8 @@ class TranslationTestCase extends DrupalWebTestCase {
// Check that new nodes with a language assigned do not trigger language
// switcher alterations when translation support is disabled.
$node = $this->createPage($this->randomName(), $this->randomName());
- $node_es = (object) array('nid' => $node->nid, 'language' => 'es');
- $node_it = (object) array('nid' => $node->nid, 'language' => 'it');
+ $node_es = (object) array('nid' => $node->nid, 'langcode' => 'es');
+ $node_it = (object) array('nid' => $node->nid, 'langcode' => 'it');
$this->assertLanguageSwitchLinks($node, $node, TRUE, $type);
$this->assertLanguageSwitchLinks($node, $node_es, TRUE, $type);
$this->assertLanguageSwitchLinks($node, $node_it, TRUE, $type);
@@ -264,7 +263,7 @@ class TranslationTestCase extends DrupalWebTestCase {
* Return an empty node data structure.
*/
function emptyNode($langcode) {
- return (object) array('nid' => NULL, 'language' => $langcode);
+ return (object) array('nid' => NULL, 'langcode' => $langcode);
}
/**
@@ -312,16 +311,16 @@ class TranslationTestCase extends DrupalWebTestCase {
* Title of basic page in specified language.
* @param $body
* Body of basic page in specified language.
- * @param
- * $language Language code.
+ * @param $langcode
+ * (optional) Language code.
*/
- function createPage($title, $body, $language = NULL) {
+ function createPage($title, $body, $langcode = NULL) {
$edit = array();
- $langcode = LANGUAGE_NONE;
+ $field_langcode = LANGUAGE_NONE;
$edit["title"] = $title;
- $edit["body[$langcode][0][value]"] = $body;
- if (!empty($language)) {
- $edit['language'] = $language;
+ $edit["body[$field_langcode][0][value]"] = $body;
+ if (!empty($langcode)) {
+ $edit['langcode'] = $langcode;
}
$this->drupalPost('node/add/page', $edit, t('Save'));
$this->assertRaw(t('Basic page %title has been created.', array('%title' => $title)), t('Basic page created.'));
@@ -343,14 +342,14 @@ class TranslationTestCase extends DrupalWebTestCase {
* Title of basic page in specified language.
* @param $body
* Body of basic page in specified language.
- * @param $language
+ * @param $langcode
* Language code.
*/
- function createTranslation($node, $title, $body, $language) {
- $this->drupalGet('node/add/page', array('query' => array('translation' => $node->nid, 'target' => $language)));
+ function createTranslation($node, $title, $body, $langcode) {
+ $this->drupalGet('node/add/page', array('query' => array('translation' => $node->nid, 'target' => $langcode)));
- $langcode = LANGUAGE_NONE;
- $body_key = "body[$langcode][0][value]";
+ $field_langcode = LANGUAGE_NONE;
+ $body_key = "body[$field_langcode][0][value]";
$this->assertFieldByXPath('//input[@id="edit-title"]', $node->title, "Original title value correctly populated.");
$this->assertFieldByXPath("//textarea[@name='$body_key']", $node->body[LANGUAGE_NONE][0]['value'], "Original body value correctly populated.");
@@ -417,8 +416,8 @@ class TranslationTestCase extends DrupalWebTestCase {
$result = TRUE;
$languages = language_list();
- $page_language = $languages[$node->language];
- $translation_language = $languages[$translation->language];
+ $page_language = $languages[$node->langcode];
+ $translation_language = $languages[$translation->langcode];
$url = url("node/$translation->nid", array('language' => $translation_language));
$this->drupalGet("node/$node->nid", array('language' => $page_language));
diff --git a/core/vendor/Symfony/Component/ClassLoader/ApcUniversalClassLoader.php b/core/vendor/Symfony/Component/ClassLoader/ApcUniversalClassLoader.php
index 278f510e5861cab0a918af87822c6b85012d4a16..1295d0ae44937659148ec4c427200b4cf28db4a2 100644
--- a/core/vendor/Symfony/Component/ClassLoader/ApcUniversalClassLoader.php
+++ b/core/vendor/Symfony/Component/ClassLoader/ApcUniversalClassLoader.php
@@ -17,7 +17,7 @@
* It is able to load classes that use either:
*
* * The technical interoperability standards for PHP 5.3 namespaces and
- * class names (http://groups.google.com/group/php-standards/web/psr-0-final-proposal);
+ * class names (https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-0.md);
*
* * The PEAR naming convention for classes (http://pear.php.net/).
*
diff --git a/core/vendor/Symfony/Component/ClassLoader/UniversalClassLoader.php b/core/vendor/Symfony/Component/ClassLoader/UniversalClassLoader.php
index d296b94d5804c34f9eac832a15fb06e8440a9baa..babf950299d5ee5eb3cc48aba98f7370bce4ae82 100644
--- a/core/vendor/Symfony/Component/ClassLoader/UniversalClassLoader.php
+++ b/core/vendor/Symfony/Component/ClassLoader/UniversalClassLoader.php
@@ -17,7 +17,7 @@
* It is able to load classes that use either:
*
* * The technical interoperability standards for PHP 5.3 namespaces and
- * class names (http://groups.google.com/group/php-standards/web/psr-0-final-proposal);
+ * class names (https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-0.md);
*
* * The PEAR naming convention for classes (http://pear.php.net/).
*
diff --git a/core/vendor/Symfony/Component/ClassLoader/composer.json b/core/vendor/Symfony/Component/ClassLoader/composer.json
index 35b573e5bb826ee864ad8aebaa7a0b1d2ae61e99..f8bde9876f98b91066b0c4ad802727747c018ae2 100644
--- a/core/vendor/Symfony/Component/ClassLoader/composer.json
+++ b/core/vendor/Symfony/Component/ClassLoader/composer.json
@@ -4,7 +4,6 @@
"description": "Symfony ClassLoader Component",
"keywords": [],
"homepage": "http://symfony.com",
- "version": "2.0.4",
"license": "MIT",
"authors": [
{
@@ -18,5 +17,9 @@
],
"require": {
"php": ">=5.3.2"
- }
+ },
+ "autoload": {
+ "psr-0": { "Symfony\\Component\\ClassLoader": "" }
+ },
+ "target-dir": "Symfony/Component/ClassLoader"
}
diff --git a/core/vendor/Symfony/Component/HttpFoundation/ApacheRequest.php b/core/vendor/Symfony/Component/HttpFoundation/ApacheRequest.php
index 27215819e499e5306abb2b0a64a873807481bd37..ca8f8eebbf8891afc3d24dd7fe0ba04827b94354 100644
--- a/core/vendor/Symfony/Component/HttpFoundation/ApacheRequest.php
+++ b/core/vendor/Symfony/Component/HttpFoundation/ApacheRequest.php
@@ -46,6 +46,6 @@ protected function prepareBaseUrl()
*/
protected function preparePathInfo()
{
- return $this->server->get('PATH_INFO');
+ return $this->server->get('PATH_INFO') ?: substr($this->prepareRequestUri(), strlen($this->prepareBaseUrl())) ?: '/';
}
}
diff --git a/core/vendor/Symfony/Component/HttpFoundation/Cookie.php b/core/vendor/Symfony/Component/HttpFoundation/Cookie.php
index 8392812ebe52503d7e076d87593ab6b576cf11ed..0511162aa6d8a8332a2bd21bd6f27a5f9e7fcc29 100644
--- a/core/vendor/Symfony/Component/HttpFoundation/Cookie.php
+++ b/core/vendor/Symfony/Component/HttpFoundation/Cookie.php
@@ -48,10 +48,6 @@ public function __construct($name, $value = null, $expire = 0, $path = '/', $dom
throw new \InvalidArgumentException(sprintf('The cookie name "%s" contains invalid characters.', $name));
}
- if (preg_match("/[,; \t\r\n\013\014]/", $value)) {
- throw new \InvalidArgumentException(sprintf('The cookie value "%s" contains invalid characters.', $value));
- }
-
if (empty($name)) {
throw new \InvalidArgumentException('The cookie name cannot be empty.');
}
diff --git a/core/vendor/Symfony/Component/HttpFoundation/File/File.php b/core/vendor/Symfony/Component/HttpFoundation/File/File.php
index 3a900fdcef615d41fe1bc786903148f44cd61060..58bc6f4f1abf95130baf16d7e08a1b89eb45e06a 100644
--- a/core/vendor/Symfony/Component/HttpFoundation/File/File.php
+++ b/core/vendor/Symfony/Component/HttpFoundation/File/File.php
@@ -428,6 +428,7 @@ class File extends \SplFileInfo
'video/vnd.sealedmedia.softseal.mov' => 'smov',
'video/vnd.vivo' => 'vivo',
'video/x-fli' => 'fli',
+ 'video/x-flv' => 'flv',
'video/x-ms-asf' => 'asf',
'video/x-ms-wmv' => 'wmv',
'video/x-msvideo' => 'avi',
@@ -445,15 +446,16 @@ class File extends \SplFileInfo
/**
* Constructs a new file from the given path.
*
- * @param string $path The path to the file
+ * @param string $path The path to the file
+ * @param Boolean $checkPath Whether to check the path or not
*
* @throws FileNotFoundException If the given path is not a file
*
* @api
*/
- public function __construct($path)
+ public function __construct($path, $checkPath = true)
{
- if (!is_file($path)) {
+ if ($checkPath && !is_file($path)) {
throw new FileNotFoundException($path);
}
diff --git a/core/vendor/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeGuesser.php b/core/vendor/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeGuesser.php
index 23dd46324d7b150f8ddeac45b24d6df61bcb2cbf..96016183b523d127cf8008b3fc89d6398d26a303 100644
--- a/core/vendor/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeGuesser.php
+++ b/core/vendor/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeGuesser.php
@@ -97,7 +97,9 @@ public function register(MimeTypeGuesserInterface $guesser)
* value.
*
* @param string $path The path to the file
+ *
* @return string The mime type or NULL, if none could be guessed
+ *
* @throws FileException If the file does not exist
*/
public function guess($path)
@@ -110,16 +112,14 @@ public function guess($path)
throw new AccessDeniedException($path);
}
- $mimeType = null;
+ if (!$this->guessers) {
+ throw new \LogicException('Unable to guess the mime type as no guessers are available (Did you enable the php_fileinfo extension?)');
+ }
foreach ($this->guessers as $guesser) {
- $mimeType = $guesser->guess($path);
-
- if (null !== $mimeType) {
- break;
+ if (null !== $mimeType = $guesser->guess($path)) {
+ return $mimeType;
}
}
-
- return $mimeType;
}
}
diff --git a/core/vendor/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeGuesserInterface.php b/core/vendor/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeGuesserInterface.php
index c11158396fe4a1bc67a591308f396f186a0adc5d..66178bb952ea4d23d295c475737bdfa7420af64d 100644
--- a/core/vendor/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeGuesserInterface.php
+++ b/core/vendor/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeGuesserInterface.php
@@ -19,10 +19,12 @@
interface MimeTypeGuesserInterface
{
/**
- * Guesses the mime type of the file with the given path
+ * Guesses the mime type of the file with the given path.
*
* @param string $path The path to the file
+ *
* @return string The mime type or NULL, if none could be guessed
+ *
* @throws FileNotFoundException If the file does not exist
* @throws AccessDeniedException If the file could not be read
*/
diff --git a/core/vendor/Symfony/Component/HttpFoundation/File/UploadedFile.php b/core/vendor/Symfony/Component/HttpFoundation/File/UploadedFile.php
index 936ed7057955d2b9af48278ff66dca1620b410d7..4e51c50010865cc5b9267f0bc8ef4d12972fc2c5 100644
--- a/core/vendor/Symfony/Component/HttpFoundation/File/UploadedFile.php
+++ b/core/vendor/Symfony/Component/HttpFoundation/File/UploadedFile.php
@@ -100,9 +100,7 @@ public function __construct($path, $originalName, $mimeType = null, $size = null
$this->error = $error ?: UPLOAD_ERR_OK;
$this->test = (Boolean) $test;
- if (UPLOAD_ERR_OK === $this->error) {
- parent::__construct($path);
- }
+ parent::__construct($path, UPLOAD_ERR_OK === $this->error);
}
/**
diff --git a/core/vendor/Symfony/Component/HttpFoundation/FileBag.php b/core/vendor/Symfony/Component/HttpFoundation/FileBag.php
index 602cff2b3cec9abe46531c37e0a35266edad3b80..702ab84c0222248d0aba8e23e8b0d9922ec691fa 100644
--- a/core/vendor/Symfony/Component/HttpFoundation/FileBag.php
+++ b/core/vendor/Symfony/Component/HttpFoundation/FileBag.php
@@ -122,6 +122,7 @@ protected function convertFileInformation($file)
* just returns the original array unmodified.
*
* @param array $data
+ *
* @return array
*/
protected function fixPhpFilesArray($data)
diff --git a/core/vendor/Symfony/Component/HttpFoundation/ParameterBag.php b/core/vendor/Symfony/Component/HttpFoundation/ParameterBag.php
index 3a38b5fab3346853a7553b74cccdc83fbf0a338f..e5d237c3af01c38a7ca227fb393d3f3e8b0294fa 100644
--- a/core/vendor/Symfony/Component/HttpFoundation/ParameterBag.php
+++ b/core/vendor/Symfony/Component/HttpFoundation/ParameterBag.php
@@ -86,8 +86,8 @@ public function add(array $parameters = array())
* Returns a parameter by name.
*
* @param string $path The key
- * @param mixed $default The default value
- * @param boolean $deep
+ * @param mixed $default The default value if the parameter key does not exist
+ * @param boolean $deep If true, a path like foo[bar] will find deeper items
*
* @api
*/
@@ -113,7 +113,7 @@ public function get($path, $default = null, $deep = false)
}
$currentKey = '';
- } else if (']' === $char) {
+ } elseif (']' === $char) {
if (null === $currentKey) {
throw new \InvalidArgumentException(sprintf('Malformed path. Unexpected "]" at position %d.', $i));
}
@@ -183,8 +183,8 @@ public function remove($key)
* Returns the alphabetic characters of the parameter value.
*
* @param string $key The parameter key
- * @param mixed $default The default value
- * @param boolean $deep
+ * @param mixed $default The default value if the parameter key does not exist
+ * @param boolean $deep If true, a path like foo[bar] will find deeper items
*
* @return string The filtered value
*
@@ -199,8 +199,8 @@ public function getAlpha($key, $default = '', $deep = false)
* Returns the alphabetic characters and digits of the parameter value.
*
* @param string $key The parameter key
- * @param mixed $default The default value
- * @param boolean $deep
+ * @param mixed $default The default value if the parameter key does not exist
+ * @param boolean $deep If true, a path like foo[bar] will find deeper items
*
* @return string The filtered value
*
@@ -215,8 +215,8 @@ public function getAlnum($key, $default = '', $deep = false)
* Returns the digits of the parameter value.
*
* @param string $key The parameter key
- * @param mixed $default The default value
- * @param boolean $deep
+ * @param mixed $default The default value if the parameter key does not exist
+ * @param boolean $deep If true, a path like foo[bar] will find deeper items
*
* @return string The filtered value
*
@@ -231,8 +231,8 @@ public function getDigits($key, $default = '', $deep = false)
* Returns the parameter value converted to integer.
*
* @param string $key The parameter key
- * @param mixed $default The default value
- * @param boolean $deep
+ * @param mixed $default The default value if the parameter key does not exist
+ * @param boolean $deep If true, a path like foo[bar] will find deeper items
*
* @return string The filtered value
*
diff --git a/core/vendor/Symfony/Component/HttpFoundation/Request.php b/core/vendor/Symfony/Component/HttpFoundation/Request.php
index e66abb7484ea8d8cb7be8daf77cc25dad97d1573..3a20ed90c5191874e6879a2694a26602baeaf8ae 100644
--- a/core/vendor/Symfony/Component/HttpFoundation/Request.php
+++ b/core/vendor/Symfony/Component/HttpFoundation/Request.php
@@ -453,7 +453,9 @@ public function getClientIp($proxy = false)
if ($this->server->has('HTTP_CLIENT_IP')) {
return $this->server->get('HTTP_CLIENT_IP');
} elseif (self::$trustProxy && $this->server->has('HTTP_X_FORWARDED_FOR')) {
- return $this->server->get('HTTP_X_FORWARDED_FOR');
+ $clientIp = explode(',', $this->server->get('HTTP_X_FORWARDED_FOR'), 2);
+
+ return isset($clientIp[0]) ? trim($clientIp[0]) : '';
}
}
@@ -560,7 +562,11 @@ public function getScheme()
*/
public function getPort()
{
- return $this->headers->get('X-Forwarded-Port') ?: $this->server->get('SERVER_PORT');
+ if (self::$trustProxy && $this->headers->has('X-Forwarded-Port')) {
+ return $this->headers->get('X-Forwarded-Port');
+ } else {
+ return $this->server->get('SERVER_PORT');
+ }
}
/**
@@ -639,7 +645,7 @@ public function getUriForPath($path)
* It builds a normalized query string, where keys/value pairs are alphabetized
* and have consistent escaping.
*
- * @return string A normalized query string for the Request
+ * @return string|null A normalized query string for the Request
*
* @api
*/
@@ -845,6 +851,24 @@ public function setRequestFormat($format)
$this->format = $format;
}
+ public function setLocale($locale)
+ {
+ if (!$this->hasSession()) {
+ throw new \LogicException('Forward compatibility for Request::setLocale() requires the session to be set.');
+ }
+
+ $this->session->setLocale($locale);
+ }
+
+ public function getLocale()
+ {
+ if (!$this->hasSession()) {
+ throw new \LogicException('Forward compatibility for Request::getLocale() requires the session to be set.');
+ }
+
+ return $this->session->getLocale();
+ }
+
/**
* Checks whether the method is safe or not.
*
@@ -903,7 +927,7 @@ public function isNoCache()
*
* @param array $locales An array of ordered available locales
*
- * @return string The preferred locale
+ * @return string|null The preferred locale
*
* @api
*/
@@ -911,7 +935,7 @@ public function getPreferredLanguage(array $locales = null)
{
$preferredLanguages = $this->getLanguages();
- if (null === $locales) {
+ if (empty($locales)) {
return isset($preferredLanguages[0]) ? $preferredLanguages[0] : null;
}
@@ -1017,6 +1041,8 @@ public function isXmlHttpRequest()
* Splits an Accept-* HTTP header.
*
* @param string $header Header to split
+ *
+ * @return array Array indexed by the values of the Accept-* header in preferred order
*/
public function splitHttpAcceptHeader($header)
{
@@ -1027,9 +1053,9 @@ public function splitHttpAcceptHeader($header)
$values = array();
foreach (array_filter(explode(',', $header)) as $value) {
// Cut off any q-value that might come after a semi-colon
- if ($pos = strpos($value, ';')) {
- $q = (float) trim(substr($value, strpos($value, '=') + 1));
- $value = trim(substr($value, 0, $pos));
+ if (preg_match('/;\s*(q=.*$)/', $value, $match)) {
+ $q = (float) substr(trim($match[1]), 2);
+ $value = trim(substr($value, 0, -strlen($match[0])));
} else {
$q = 1;
}
@@ -1057,7 +1083,7 @@ protected function prepareRequestUri()
{
$requestUri = '';
- if ($this->headers->has('X_REWRITE_URL')) {
+ if ($this->headers->has('X_REWRITE_URL') && false !== stripos(PHP_OS, 'WIN')) {
// check this first so IIS will catch
$requestUri = $this->headers->get('X_REWRITE_URL');
} elseif ($this->server->get('IIS_WasUrlRewritten') == '1' && $this->server->get('UNENCODED_URL') != '') {
diff --git a/core/vendor/Symfony/Component/HttpFoundation/RequestMatcher.php b/core/vendor/Symfony/Component/HttpFoundation/RequestMatcher.php
index 52ba0784bbca84ea377a3bebde4cd64d6d54d33b..e82b3e197b088b0d54539abdd5e0a81af9f7528a 100644
--- a/core/vendor/Symfony/Component/HttpFoundation/RequestMatcher.php
+++ b/core/vendor/Symfony/Component/HttpFoundation/RequestMatcher.php
@@ -135,7 +135,7 @@ protected function checkIp($requestIp, $ip)
protected function checkIp4($requestIp, $ip)
{
if (false !== strpos($ip, '/')) {
- list($address, $netmask) = explode('/', $ip);
+ list($address, $netmask) = explode('/', $ip, 2);
if ($netmask < 1 || $netmask > 32) {
return false;
@@ -158,14 +158,14 @@ protected function checkIp6($requestIp, $ip)
throw new \RuntimeException('Unable to check Ipv6. Check that PHP was not compiled with option "disable-ipv6".');
}
- list($address, $netmask) = explode('/', $ip);
+ list($address, $netmask) = explode('/', $ip, 2);
$bytes_addr = unpack("n*", inet_pton($address));
$bytes_test = unpack("n*", inet_pton($requestIp));
for ($i = 1, $ceil = ceil($netmask / 16); $i <= $ceil; $i++) {
$left = $netmask - 16 * ($i-1);
- $left = ($left <= 16) ?: 16;
+ $left = ($left <= 16) ? $left : 16;
$mask = ~(0xffff >> $left) & 0xffff;
if (($bytes_addr[$i] & $mask) != ($bytes_test[$i] & $mask)) {
return false;
diff --git a/core/vendor/Symfony/Component/HttpFoundation/Response.php b/core/vendor/Symfony/Component/HttpFoundation/Response.php
index e8a7d5624498207233dbb764f510e20decb769d5..b6cb48492c528b93bb104ddfade43bd43b9e802b 100644
--- a/core/vendor/Symfony/Component/HttpFoundation/Response.php
+++ b/core/vendor/Symfony/Component/HttpFoundation/Response.php
@@ -134,7 +134,7 @@ public function prepare()
$charset = $this->charset ?: 'UTF-8';
if (!$this->headers->has('Content-Type')) {
$this->headers->set('Content-Type', 'text/html; charset='.$charset);
- } elseif ('text/' === substr($this->headers->get('Content-Type'), 0, 5) && false === strpos($this->headers->get('Content-Type'), 'charset')) {
+ } elseif (0 === strpos($this->headers->get('Content-Type'), 'text/') && false === strpos($this->headers->get('Content-Type'), 'charset')) {
// add the charset
$this->headers->set('Content-Type', $this->headers->get('Content-Type').'; charset='.$charset);
}
@@ -197,7 +197,7 @@ public function send()
}
/**
- * Sets the response content
+ * Sets the response content.
*
* Valid types are strings, numbers, and objects that implement a __toString() method.
*
@@ -215,7 +215,7 @@ public function setContent($content)
}
/**
- * Gets the current response content
+ * Gets the current response content.
*
* @return string Content
*
@@ -251,7 +251,7 @@ public function getProtocolVersion()
}
/**
- * Sets response status code.
+ * Sets the response status code.
*
* @param integer $code HTTP status code
* @param string $text HTTP status text
@@ -271,7 +271,7 @@ public function setStatusCode($code, $text = null)
}
/**
- * Retrieves status code for the current web response.
+ * Retrieves the status code for the current web response.
*
* @return string Status code
*
@@ -283,7 +283,7 @@ public function getStatusCode()
}
/**
- * Sets response charset.
+ * Sets the response charset.
*
* @param string $charset Character set
*
@@ -409,7 +409,7 @@ public function mustRevalidate()
*
* @return \DateTime A \DateTime instance
*
- * @throws \RuntimeException when the header is not parseable
+ * @throws \RuntimeException When the header is not parseable
*
* @api
*/
@@ -470,7 +470,7 @@ public function getExpires()
}
/**
- * Sets the Expires HTTP header with a \DateTime instance.
+ * Sets the Expires HTTP header with a DateTime instance.
*
* If passed a null value, it removes the header.
*
@@ -522,7 +522,7 @@ public function getMaxAge()
*
* This methods sets the Cache-Control max-age directive.
*
- * @param integer $value A number of seconds
+ * @param integer $value Number of seconds
*
* @api
*/
@@ -536,7 +536,7 @@ public function setMaxAge($value)
*
* This methods sets the Cache-Control s-maxage directive.
*
- * @param integer $value A number of seconds
+ * @param integer $value Number of seconds
*
* @api
*/
@@ -572,7 +572,7 @@ public function getTtl()
*
* This method adjusts the Cache-Control/s-maxage directive.
*
- * @param integer $seconds The number of seconds
+ * @param integer $seconds Number of seconds
*
* @api
*/
@@ -586,7 +586,7 @@ public function setTtl($seconds)
*
* This method adjusts the Cache-Control/max-age directive.
*
- * @param integer $seconds The number of seconds
+ * @param integer $seconds Number of seconds
*
* @api
*/
@@ -608,7 +608,7 @@ public function getLastModified()
}
/**
- * Sets the Last-Modified HTTP header with a \DateTime instance.
+ * Sets the Last-Modified HTTP header with a DateTime instance.
*
* If passed a null value, it removes the header.
*
@@ -628,7 +628,7 @@ public function setLastModified(\DateTime $date = null)
}
/**
- * Returns the literal value of ETag HTTP header.
+ * Returns the literal value of the ETag HTTP header.
*
* @return string The ETag HTTP header
*
@@ -661,7 +661,7 @@ public function setEtag($etag = null, $weak = false)
}
/**
- * Sets Response cache headers (validation and/or expiration).
+ * Sets the response's cache headers (validation and/or expiration).
*
* Available options are: etag, last_modified, max_age, s_maxage, private, and public.
*
@@ -672,7 +672,7 @@ public function setEtag($etag = null, $weak = false)
public function setCache(array $options)
{
if ($diff = array_diff(array_keys($options), array('etag', 'last_modified', 'max_age', 's_maxage', 'private', 'public'))) {
- throw new \InvalidArgumentException(sprintf('Response does not support the following options: "%s".', implode('", "', array_keys($diff))));
+ throw new \InvalidArgumentException(sprintf('Response does not support the following options: "%s".', implode('", "', array_values($diff))));
}
if (isset($options['etag'])) {
@@ -771,15 +771,15 @@ public function setVary($headers, $replace = true)
}
/**
- * Determines if the Response validators (ETag, Last-Modified) matches
+ * Determines if the Response validators (ETag, Last-Modified) match
* a conditional value specified in the Request.
*
* If the Response is not modified, it sets the status code to 304 and
- * remove the actual content by calling the setNotModified() method.
+ * removes the actual content by calling the setNotModified() method.
*
* @param Request $request A Request instance
*
- * @return Boolean true if the Response validators matches the Request, false otherwise
+ * @return Boolean true if the Response validators match the Request, false otherwise
*
* @api
*/
diff --git a/core/vendor/Symfony/Component/HttpFoundation/ResponseHeaderBag.php b/core/vendor/Symfony/Component/HttpFoundation/ResponseHeaderBag.php
index f243dcc9f6bbbe95117681bd21b2404f31206513..999f0ab117a17db82cebfe1bd6018353d77ecc16 100644
--- a/core/vendor/Symfony/Component/HttpFoundation/ResponseHeaderBag.php
+++ b/core/vendor/Symfony/Component/HttpFoundation/ResponseHeaderBag.php
@@ -120,6 +120,7 @@ public function getCacheControlDirective($key)
* Sets a cookie.
*
* @param Cookie $cookie
+ *
* @return void
*
* @api
@@ -135,6 +136,7 @@ public function setCookie(Cookie $cookie)
* @param string $name
* @param string $path
* @param string $domain
+ *
* @return void
*
* @api
@@ -195,6 +197,7 @@ public function getCookies($format = self::COOKIES_FLAT)
* @param string $name
* @param string $path
* @param string $domain
+ *
* @return void
*
* @api
diff --git a/core/vendor/Symfony/Component/HttpFoundation/ServerBag.php b/core/vendor/Symfony/Component/HttpFoundation/ServerBag.php
index 02db3b181907aee82fcfb21a7d10252b9de0e61f..9cb7786129cb232e8eb7021c682c03ad768193f0 100644
--- a/core/vendor/Symfony/Component/HttpFoundation/ServerBag.php
+++ b/core/vendor/Symfony/Component/HttpFoundation/ServerBag.php
@@ -23,7 +23,7 @@ public function getHeaders()
{
$headers = array();
foreach ($this->parameters as $key => $value) {
- if ('HTTP_' === substr($key, 0, 5)) {
+ if (0 === strpos($key, 'HTTP_')) {
$headers[substr($key, 5)] = $value;
}
// CONTENT_* are not prefixed with HTTP_
diff --git a/core/vendor/Symfony/Component/HttpFoundation/SessionStorage/FilesystemSessionStorage.php b/core/vendor/Symfony/Component/HttpFoundation/SessionStorage/FilesystemSessionStorage.php
index 87abd01bcde2461f17794674831e583b175897be..e6eb9ba2bbe0d35f2f8d44fb4961d204cbab8fca 100644
--- a/core/vendor/Symfony/Component/HttpFoundation/SessionStorage/FilesystemSessionStorage.php
+++ b/core/vendor/Symfony/Component/HttpFoundation/SessionStorage/FilesystemSessionStorage.php
@@ -94,7 +94,8 @@ public function getId()
*
* The preferred format for a key is directory style so naming conflicts can be avoided.
*
- * @param string $key A unique key identifying your data
+ * @param string $key A unique key identifying your data
+ * @param string $default The default value
*
* @return mixed Data associated with the key
*
diff --git a/core/vendor/Symfony/Component/HttpFoundation/SessionStorage/PdoSessionStorage.php b/core/vendor/Symfony/Component/HttpFoundation/SessionStorage/PdoSessionStorage.php
index 78f90b8ec9564a28bae927012295924fec996bd2..09d032a724a8dc12263e93381019a0fc99983a27 100644
--- a/core/vendor/Symfony/Component/HttpFoundation/SessionStorage/PdoSessionStorage.php
+++ b/core/vendor/Symfony/Component/HttpFoundation/SessionStorage/PdoSessionStorage.php
@@ -143,7 +143,6 @@ public function sessionGC($lifetime)
$sql = "DELETE FROM $dbTable WHERE $dbTimeCol < (:time - $lifetime)";
try {
- $this->db->query($sql);
$stmt = $this->db->prepare($sql);
$stmt->bindValue(':time', time(), \PDO::PARAM_INT);
$stmt->execute();
@@ -182,7 +181,7 @@ public function sessionRead($id)
$sessionRows = $stmt->fetchAll(\PDO::FETCH_NUM);
if (count($sessionRows) == 1) {
- return $sessionRows[0][0];
+ return base64_decode($sessionRows[0][0]);
}
// session does not exist, create it
@@ -218,9 +217,11 @@ public function sessionWrite($id, $data)
: "UPDATE $dbTable SET $dbDataCol = :data, $dbTimeCol = :time WHERE $dbIdCol = :id";
try {
+ //session data can contain non binary safe characters so we need to encode it
+ $encoded = base64_encode($data);
$stmt = $this->db->prepare($sql);
$stmt->bindParam(':id', $id, \PDO::PARAM_STR);
- $stmt->bindParam(':data', $data, \PDO::PARAM_STR);
+ $stmt->bindParam(':data', $encoded, \PDO::PARAM_STR);
$stmt->bindValue(':time', time(), \PDO::PARAM_INT);
$stmt->execute();
@@ -252,9 +253,11 @@ private function createNewSession($id, $data = '')
$sql = "INSERT INTO $dbTable ($dbIdCol, $dbDataCol, $dbTimeCol) VALUES (:id, :data, :time)";
+ //session data can contain non binary safe characters so we need to encode it
+ $encoded = base64_encode($data);
$stmt = $this->db->prepare($sql);
$stmt->bindParam(':id', $id, \PDO::PARAM_STR);
- $stmt->bindParam(':data', $data, \PDO::PARAM_STR);
+ $stmt->bindParam(':data', $encoded, \PDO::PARAM_STR);
$stmt->bindValue(':time', time(), \PDO::PARAM_INT);
$stmt->execute();
diff --git a/core/vendor/Symfony/Component/HttpFoundation/composer.json b/core/vendor/Symfony/Component/HttpFoundation/composer.json
index b3cfbbd1a72800af5a867710995d1ff695444db0..53e0b100f5f7d7517a00493a00f654387f7500d0 100644
--- a/core/vendor/Symfony/Component/HttpFoundation/composer.json
+++ b/core/vendor/Symfony/Component/HttpFoundation/composer.json
@@ -4,7 +4,6 @@
"description": "Symfony HttpFoundation Component",
"keywords": [],
"homepage": "http://symfony.com",
- "version": "2.0.4",
"license": "MIT",
"authors": [
{
@@ -18,5 +17,9 @@
],
"require": {
"php": ">=5.3.2"
- }
+ },
+ "autoload": {
+ "psr-0": { "Symfony\\Component\\HttpFoundation": "" }
+ },
+ "target-dir": "Symfony/Component/HttpFoundation"
}