Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

8.0.x
Daniel Wehner 2012-08-06 15:37:08 +02:00 committed by Tim Plunkett
parent a5adf1c52c
commit 987f73ad36
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/Drupal/views/ViewsObject.php
View File

@ -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 @@ class ViewsObject {
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.
*/

5
plugins/views_plugin_display.inc
View File

@ -424,6 +424,8 @@ class views_plugin_display extends views_plugin {
'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 @@ class views_plugin_display extends views_plugin {
),
'use_more_always' => array(
'default' => FALSE,
'bool' => FALSE,
'bool' => TRUE,
'export' => 'export_option_always',
),
'use_more_text' => array(
'default' => 'more',