opdavies/drupalcampbristol
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to Drupal 8.0.6. For more information, see https://www.drupal.org/drupal-8.0.6-release-notes

Browse source
This commit is contained in:
Pantheon Automation 2016-04-07 11:19:57 -07:00 • committed by Greg Anderson
parent 4297c64508
commit b11a755ba8
159 changed files with 2340 additions and 543 deletions
Download patch file Download diff file Expand all files Collapse all files

4
core/modules/locale/locale.batch.inc
View file

@ -33,10 +33,10 @@ require_once __DIR__ . '/locale.translation.inc';
* batch is finished. Optional, defaults to TRUE.
* - 'use_remote': Whether or not to check the remote translation file.
* Optional, defaults to TRUE.
* @param array $context
* @param array|\ArrayAccess $context.
* The batch context.
*/
function locale_translation_batch_status_check($project, $langcode, array $options, array &$context) {
function locale_translation_batch_status_check($project, $langcode, array $options, &$context) {
$failure = $checked = FALSE;
$options += array(
'finish_feedback' => TRUE,

16
core/modules/locale/locale.bulk.inc
View file

@ -185,10 +185,10 @@ function locale_translate_batch_build(array $files, array $options) {
* LOCALE_NOT_CUSTOMIZED.
* - 'message': Alternative message to display during import. Note, this must
* be sanitized text.
* @param array $context
* @param array|\ArrayAccess $context.
* Contains a list of files imported.
*/
function locale_translate_batch_import($file, array $options, array &$context) {
function locale_translate_batch_import($file, array $options, &$context) {
// Merge the default values in the $options array.
$options += array(
'overwrite_options' => array(),
@ -268,10 +268,10 @@ function locale_translate_batch_import($file, array $options, array &$context) {
*
* Save data of imported files.
*
* @param array $context
* @param array|\ArrayAccess $context.
* Contains a list of imported files.
*/
function locale_translate_batch_import_save(array $context) {
function locale_translate_batch_import_save($context) {
if (isset($context['results']['files'])) {
foreach ($context['results']['files'] as $file) {
// Update the file history if both project and version are known. This
@ -293,10 +293,10 @@ function locale_translate_batch_import_save(array $context) {
*
* Refreshes translations after importing strings.
*
* @param array $context
* @param array|\ArrayAccess $context.
* Contains a list of strings updated and information about the progress.
*/
function locale_translate_batch_refresh(array &$context) {
function locale_translate_batch_refresh(&$context) {
if (!isset($context['sandbox']['refresh'])) {
$strings = $langcodes = array();
if (isset($context['results']['stats'])) {
@ -597,12 +597,12 @@ function locale_config_batch_build(array $names, array $langcodes, array $option
* An array of names of configuration objects to update.
* @param array $langcodes
* (optional) Array of language codes to update. Defaults to all languages.
* @param array $context
* @param array|\ArrayAccess $context.
* Contains a list of files imported.
*
* @see locale_config_batch_build()
*/
function locale_config_batch_refresh_name(array $names, array $langcodes, array &$context) {
function locale_config_batch_refresh_name(array $names, array $langcodes, &$context) {
if (!isset($context['result']['stats']['config'])) {
$context['result']['stats']['config'] = 0;
}