Commit 987f73ad authored by dawehner's avatar dawehner Committed by tim.plunkett
Browse files

Issue #1557680 by tim.plunkett, dawehner, DuaelFr: Fixed More link options not imported.

parent a5adf1c5
......@@ -51,6 +51,7 @@ class ViewsObject {
* Returns the options of this handler/plugin.
*
* @see Drupal\views\ViewsObject::export_option()
* @see Drupal\views\ViewsObject::export_option_always()
* @see Drupal\views\ViewsObject::unpack_translatable()
*/
function option_definition() { return array(); }
......@@ -260,6 +261,17 @@ function export_option($indent, $prefix, $storage, $option, $definition, $parent
return $output;
}
/**
* Always exports the option, regardless of the default value.
*/
function export_option_always($indent, $prefix, $storage, $option, $definition, $parents) {
// If there is no default, the option will always be exported.
unset($definition['default']);
// Unset our export method to prevent recursion.
unset($definition['export']);
return $this->export_option($indent, $prefix, $storage, $option, $definition, $parents);
}
/**
* Unpacks each handler to store translatable texts.
*/
......
......@@ -424,6 +424,8 @@ function defaultable_sections($section = NULL) {
'group_by' => array('group_by'),
'query' => array('query'),
'use_more' => array('use_more', 'use_more_always', 'use_more_text'),
'use_more_always' => array('use_more', 'use_more_always', 'use_more_text'),
'use_more_text' => array('use_more', 'use_more_always', 'use_more_text'),
'link_display' => array('link_display', 'link_url'),
// Force these to cascade properly.
......@@ -562,7 +564,8 @@ function option_definition() {
),
'use_more_always' => array(
'default' => FALSE,
'bool' => FALSE,
'bool' => TRUE,
'export' => 'export_option_always',
),
'use_more_text' => array(
'default' => 'more',
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment