#839810 by marcp: Get UID from URL argument default plugin should accept uids from Views pages.
#1012584 by dereine: Allow filtering on term descriptions.
#895046 by bojanz, dereine, merlinofchaos: Implement proper multiple field api handling and improve field api rendering in general.
+#1035168 by Ao: Fix strict warning in unread node filter.
+#1044916 by dagmar: Fix improper use of set_current_page member variable.
+#1016814 by eaton: string argument should support name_field.
+#1007376 by dereine: Jump menu was not correctly supporting offsets.
+#1018160 by zhangtaihao: unpack_translatable could infinitely recurse when options are arrays but not declared as such.
+#776830: Attachments and other displays lost "Items to display" controls.
+#747782 by dereine: Improve jump menu grouping.
+#1026014 by dereine and alex_b: Use more always should not ask for the count query to see if we need to show the more link.
+#1012596 by dereine: More inline documentation of class variables.
+#988680 by mikeytown2: Fix Views memory leak with attachments.
+#1023062 by mikejoconnor: Replace views_process_dependency with ctools_dependent_process again.
+#1023558 by mariusz.slonina: Add a user cancel account link.
+#1015960 by duellj: View js should use DOM element not jquery object.
+#1027552 by david_Rothstein: Fix Node: Has new content fatal error.
+#955464 by dereine: Fix many_to_one helper in the case of have no condition and operator = 'and'.
+#696550: Taxonomy validator should always set title when it successfully validates.
+#869172 by bendiy: Add an "external" parameter to field link rewriting so that external URLs can be formed properly even without a scheme.
+#935176 by benoit.borrel: Add "system" table to Views data.
+#839236: Fields named "buttons" would disappear from the rearrange UI due to conflict with the buttons on the form.
+#783514 by dereine: Allow breaking of strings with + and ,
+#1000760 by dereine: Prevent htmlspecialchars() error with string arguments.
+#1033494 by dereine: Fix filter by user picture: change used handler.
+#895046 by bojanz: Follow up of the multiple field handler. Fixes an issue with group-by and rename entity_api_classes.
+#1044250 by dereine: Fix notice in views_handler_filter_history_user_timestamp for disabled comment module.
+#1018872 by dereine: field_field handler shouldn't force to set base field in relationship.
+#1049586 by fgm: Fix strict error in field_field::init.
+#1049276 by david_Rothstein: Commit the 6.11 patch to d7.
+#1011226 by Chris Gillis, Sutharsan: Fix display of error messages in the views inteface.
+#1050962 by Sutharsan: Convert #value to #markup in validate methods.
+#1051034 by Manuel Garcia: Allow field wrapper class to take multiple classes.
+#957284 by dereine: Fix search filter to work with d7 version of search.module's api.
+#534452 by dereine: Remove non-functional "optional" setting on string filters.
+#1019826 by penguin25: Respect contact page access overrides when displaying contact link.
+#652684 by dereine: Search and replace error resulted in invalid function name in nid argument validator.
+#1008358: Updated for translation plugin to work properly with i18nviews.
+#1055378 by mfb: Fix rss_namespaces.
+#957284: by dereine: Followup for filter_search fix.
Views 3.x-7.x-alpha1 (05-Jan-2011)
==================================
#1016430 by bojanz: fix two small bugs in field_field handler.
by dereine: Add $view->version to all default views.
#1006176 by das-peter, bojanz: Add support for field based translation.
-#1023062 by mikejoconnor: Replace views_process_dependency with ctools_dependent_process again.
-#1023558 by mariusz.slonina: Add a user cancel account link.
-#1015960 by duellj: View js should use DOM element not jquery object.
-#1027552 by david_Rothstein: Fix Node: Has new content fatal error.
-#955464 by dereine: Fix many_to_one helper in the case of have no condition and operator = 'and'.
-#696550: Taxonomy validator should always set title when it successfully validates.
-#869172 by bendiy: Add an "external" parameter to field link rewriting so that external URLs can be formed properly even without a scheme.
-#935176 by benoit.borrel: Add "system" table to Views data.
-#839236: Fields named "buttons" would disappear from the rearrange UI due to conflict with the buttons on the form.
-#783514 by dereine: Allow breaking of strings with + and ,
-#1000760 by dereine: Prevent htmlspecialchars() error with string arguments.
-#1033494 by dereine: Fix filter by user picture: change used handler.
-#895046 by bojanz: Follow up of the multiple field handler. Fixes an issue with group-by and rename entity_api_classes.
/views_ui.info/1.10.6.2/Result of merge//TDRUPAL-7--3
/views_ui.module/1.109.6.18/Result of merge+Thu Jan 6 23:31:38 2011//TDRUPAL-7--3
/views.install/1.50.4.12/Fri Jan 14 21:12:54 2011//TDRUPAL-7--3
-/D7UPGRADE.txt/1.1.2.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/README.txt/1.26.6.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/documentation-standards.txt/1.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views.drush.inc/1.1.6.2/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views.info/1.7.6.62/Result of merge//TDRUPAL-7--3
-/views.module/1.341.4.53/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views2.doxy/1.2/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views3.doxy/1.1.2.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/CHANGELOG.txt/1.344.4.649/Fri Jan 28 23:28:31 2011//TDRUPAL-7--3
+/CHANGELOG.txt/1.344.4.672/Wed Feb 9 20:52:01 2011//TDRUPAL-7--3
+/D7UPGRADE.txt/1.1.2.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/README.txt/1.26.6.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/documentation-standards.txt/1.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views.drush.inc/1.1.6.2/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views.info/1.7.6.63/Result of merge+Wed Feb 9 20:52:01 2011//TDRUPAL-7--3
+/views.module/1.341.4.54/Result of merge//TDRUPAL-7--3
+/views2.doxy/1.2/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views3.doxy/1.1.2.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
/views-admin.css/1.14.4.12/Result of merge+Thu Jan 6 23:31:38 2011//TDRUPAL-7--3
-/views-list-rtl.css/1.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views-list.css/1.12.6.2/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views-rtl.css/1.1.2.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views-tabs.css/1.1.6.3/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views.css/1.11.6.5/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
+/views-list-rtl.css/1.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views-list.css/1.12.6.2/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views-rtl.css/1.1.2.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views-tabs.css/1.1.6.3/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views.css/1.11.6.5/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
D
-/docs.php/1.16.4.10/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
+/docs.php/1.16.4.10/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
D
/views_handler_field_date.inc/1.3.4.6/Thu Jan 6 23:31:38 2011//TDRUPAL-7--3
/views_handler_field_numeric.inc/1.6.4.4/Thu Jan 6 23:29:45 2011//TDRUPAL-7--3
/views_handler_field_prerender_list.inc/1.3.4.4/Thu Jan 6 23:29:45 2011//TDRUPAL-7--3
-/views_handler_field_url.inc/1.1/Thu Jan 6 23:29:45 2011//TDRUPAL-7--3
-/views_handler_area.inc/1.1.4.3/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_area_text.inc/1.1.4.7/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_argument.inc/1.9.4.12/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_argument_date.inc/1.3.6.3/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_argument_formula.inc/1.1.6.3/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_argument_group_by_numeric.inc/1.1.4.2/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_argument_many_to_one.inc/1.1.6.3/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_argument_null.inc/1.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_argument_numeric.inc/1.1.6.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_argument_string.inc/1.5.4.10/Fri Jan 28 23:27:49 2011//TDRUPAL-7--3
-/views_handler_field.inc/1.33.4.49/Result of merge+Fri Jan 28 23:27:49 2011//TDRUPAL-7--3
-/views_handler_field_custom.inc/1.1.6.2/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_field_group_by_numeric.inc/1.1.4.6/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_field_markup.inc/1.3.6.5/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_field_math.inc/1.1.2.3/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_filter.inc/1.10.4.15/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_filter_boolean_operator.inc/1.6.4.8/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_filter_boolean_operator_string.inc/1.2.4.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_filter_date.inc/1.3.6.8/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_filter_equality.inc/1.2/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_filter_group_by_numeric.inc/1.1.4.7/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_filter_in_operator.inc/1.12.4.11/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_filter_many_to_one.inc/1.2.4.5/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_filter_numeric.inc/1.7.6.7/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_filter_string.inc/1.8.4.7/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_relationship.inc/1.4.4.4/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_sort.inc/1.2.4.4/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_sort_date.inc/1.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_sort_group_by_numeric.inc/1.1.4.4/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_sort_menu_hierarchy.inc/1.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_sort_random.inc/1.1.6.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
+/views_handler_area.inc/1.1.4.3/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_area_text.inc/1.1.4.7/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_argument.inc/1.9.4.12/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_argument_date.inc/1.3.6.3/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_argument_formula.inc/1.1.6.3/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_argument_group_by_numeric.inc/1.1.4.2/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_argument_many_to_one.inc/1.1.6.3/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_argument_null.inc/1.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_argument_numeric.inc/1.1.6.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_argument_string.inc/1.5.4.11/Wed Feb 9 20:52:01 2011//TDRUPAL-7--3
+/views_handler_field.inc/1.33.4.50/Result of merge//TDRUPAL-7--3
+/views_handler_field_custom.inc/1.1.6.2/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_field_group_by_numeric.inc/1.1.4.6/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_field_markup.inc/1.3.6.5/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_field_math.inc/1.1.2.3/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_field_url.inc/1.1.6.1/Result of merge//TDRUPAL-7--3
+/views_handler_filter.inc/1.10.4.16/Wed Feb 9 20:52:01 2011//TDRUPAL-7--3
+/views_handler_filter_boolean_operator.inc/1.6.4.8/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_filter_boolean_operator_string.inc/1.2.4.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_filter_date.inc/1.3.6.8/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_filter_equality.inc/1.2/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_filter_group_by_numeric.inc/1.1.4.7/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_filter_in_operator.inc/1.12.4.11/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_filter_many_to_one.inc/1.2.4.5/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_filter_numeric.inc/1.7.6.7/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_filter_string.inc/1.8.4.8/Wed Feb 9 20:52:01 2011//TDRUPAL-7--3
+/views_handler_relationship.inc/1.4.4.4/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_sort.inc/1.2.4.4/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_sort_date.inc/1.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_sort_group_by_numeric.inc/1.1.4.4/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_sort_menu_hierarchy.inc/1.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_sort_random.inc/1.1.6.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
D
<?php
-// $Id: views_handler_argument_string.inc,v 1.5.4.10 2011/01/22 23:29:19 dereine Exp $
+// $Id: views_handler_argument_string.inc,v 1.5.4.11 2011/02/04 23:40:25 merlinofchaos Exp $
/**
* Basic argument handler to implement string arguments that may have length
if (empty($this->options['glossary'])) {
// Add the field.
- $this->base_alias = $this->name_alias = $this->query->add_field($this->table_alias, $this->real_field);
+ $this->base_alias = $this->query->add_field($this->table_alias, $this->real_field);
$this->query->set_count_field($this->table_alias, $this->real_field);
}
else {
),
);
- $this->base_alias = $this->name_alias = $this->query->add_field(NULL, $formula, $this->field . '_truncated', $params);
+ $this->base_alias = $this->query->add_field(NULL, $formula, $this->field . '_truncated', $params);
$this->query->set_count_field(NULL, $formula, $this->field, $this->field . '_truncated');
}
+ $this->summary_name_field();
return $this->summary_basics(FALSE);
}
<?php
-// $Id: views_handler_field.inc,v 1.33.4.49 2011/01/22 14:25:27 dereine Exp $
+// $Id: views_handler_field.inc,v 1.33.4.50 2011/02/04 14:14:11 dereine Exp $
/**
* @defgroup views_field_handlers Views' field handlers
* @{
* Return the class of the field's wrapper.
*/
function element_wrapper_classes() {
- return drupal_clean_css_identifier($this->options['element_wrapper_class']);
+ $classes = explode(' ', $this->options['element_wrapper_class']);
+ foreach ($classes as $key => $class) {
+ $classes[$key] = drupal_clean_css_identifier($class);
+ }
+ return implode(' ', $classes);
}
function option_definition() {
$form['element_wrapper_class'] = array(
'#title' => t('Wrapper class'),
- '#description' => t('The class to provide on the wrapper element.'),
+ '#description' => t('The class to provide on the wrapper element. Separate multiple classes with a space.'),
'#type' => 'textfield',
'#default_value' => $this->options['element_wrapper_class'],
'#fieldset' => 'style_settings',
<?php
-// $Id: views_handler_field_url.inc,v 1.1 2008/09/03 19:21:28 merlinofchaos Exp $
+// $Id: views_handler_field_url.inc,v 1.1.6.1 2011/02/04 12:29:01 dereine Exp $
/**
* Field handler to provide simple renderer that turns a URL into a clickable link.
return l(check_plain($value), $value, array('html' => TRUE));
}
else {
- return $value;
+ return check_url($value);
}
}
}
<?php
-// $Id: views_handler_filter.inc,v 1.10.4.15 2010/12/24 13:42:00 dereine Exp $
+// $Id: views_handler_filter.inc,v 1.10.4.16 2011/02/06 14:08:33 dereine Exp $
/**
* @defgroup views_filter_handlers Views' filter handlers
* @{
* Definition items:
* - allow empty: If true, the 'IS NULL' and 'IS NOT NULL' operators become
* available as standard operators.
- * -
+ *
+ * Object flags:
+ * You can set some specific behavior by setting up the following flags on
+ * your custom class.
+ *
+ * - no_single:
+ * Disable the possibility to force a single value.
+ * - no_operator:
+ * Disable the possibility to use operators.
+ * - no_optional:
+ * Disable the possibility to allow a exposed input to be optional.
*/
/**
* Handle the 'right' side fo the exposed options form.
*/
function expose_form_right(&$form, &$form_state) {
- $form['expose']['optional'] = array(
- '#type' => 'checkbox',
- '#title' => t('Optional'),
- '#description' => t('This exposed filter is optional and will have added options to allow it not to be set.'),
- '#default_value' => $this->options['expose']['optional'],
- );
+ if (empty($this->no_optional)) {
+ $form['expose']['optional'] = array(
+ '#type' => 'checkbox',
+ '#title' => t('Optional'),
+ '#description' => t('This exposed filter is optional and will have added options to allow it not to be set.'),
+ '#default_value' => $this->options['expose']['optional'],
+ );
+ }
if (empty($this->no_single)) {
$form['expose']['single'] = array(
'#type' => 'checkbox',
$form['#size'] = NULL;
}
- if ($type == 'value' && !empty($this->options['expose']['optional']) && $form['#type'] == 'select' && empty($form['#multiple'])) {
+ if ($type == 'value' && empty($this->no_optional) && !empty($this->options['expose']['optional']) && $form['#type'] == 'select' && empty($form['#multiple'])) {
$any_label = variable_get('views_exposed_filter_any_label', 'old_any') == 'old_any' ? t('<Any>') : t('- Any -');
$form['#options'] = array('All' => $any_label) + $form['#options'];
$form['#default_value'] = 'All';
$value = $input[$this->options['expose']['identifier']];
// Various ways to check for the absence of optional input.
- if (!empty($this->options['expose']['optional'])) {
+ if (empty($this->no_optional) && !empty($this->options['expose']['optional'])) {
if (($this->operator == 'empty' || $this->operator == 'not empty') && $value === '') {
$value = ' ';
<?php
-// $Id: views_handler_filter_string.inc,v 1.8.4.7 2011/01/07 18:10:54 dereine Exp $
+// $Id: views_handler_filter_string.inc,v 1.8.4.8 2011/02/06 14:08:33 dereine Exp $
/**
* Basic textfield filter to handle string filtering commands
class views_handler_filter_string extends views_handler_filter {
// exposed filter options
var $no_single = TRUE;
+ var $no_optional = TRUE;
+
+ function option_defintion() {
+ $options = parent::option_defintion();
+
+ $options['expose']['contains']['optional'] = array('default' => FALSE);
+
+ return $options;
+ }
/**
* This kind of construct makes it relatively easy for a child class
D/images////
-/about.html/1.5.6.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/analyze-theme.html/1.5.6.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/api-default-views.html/1.3.6.4/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/api-example.html/1.2.4.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/api-handlers.html/1.4.6.2/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/api-plugins.html/1.7.6.2/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/api-tables.html/1.8.4.3/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/api-upgrading.html/1.1.2.5/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/api.html/1.5.6.2/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/argument.html/1.8.6.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/display-attachment.html/1.2/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/display-block.html/1.5/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/display-default.html/1.2/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/display-feed.html/1.2/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/display-page.html/1.3.6.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/display.html/1.2.6.2/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/embed.html/1.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/example-author-block.html/1.1.6.2/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/example-recent-stories.html/1.1.6.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/example-user-feed.html/1.1.6.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/example-users-by-role.html/1.1.6.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/field.html/1.2/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/filter.html/1.3/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/getting-started.html/1.8/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/menu.html/1.2.6.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/new.html/1.5.6.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/overrides.html/1.2.6.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/path.html/1.3/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/relationship.html/1.6/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/sort.html/1.2/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/style-comment-rss.html/1.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/style-fields.html/1.3/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/style-grid.html/1.3.6.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/style-list.html/1.3.6.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/style-node-rss.html/1.2/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/style-node.html/1.4.6.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/style-row.html/1.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/style-rss.html/1.2/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/style-summary-unformatted.html/1.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/style-summary.html/1.2/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/style-table.html/1.2/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/style-unformatted.html/1.2/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/style.html/1.4.6.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/theme-css.html/1.3.6.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/updating.html/1.3/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/upgrading.html/1.1.2.2/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/using-theme.html/1.6.6.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/view-type.html/1.5/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views.help.ini/1.18.4.5/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
+/about.html/1.5.6.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/analyze-theme.html/1.5.6.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/api-default-views.html/1.3.6.4/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/api-example.html/1.2.4.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/api-handlers.html/1.4.6.2/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/api-plugins.html/1.7.6.2/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/api-tables.html/1.8.4.3/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/api-upgrading.html/1.1.2.5/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/api.html/1.5.6.2/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/argument.html/1.8.6.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/display-attachment.html/1.2/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/display-block.html/1.5/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/display-default.html/1.2/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/display-feed.html/1.2/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/display-page.html/1.3.6.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/display.html/1.2.6.2/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/embed.html/1.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/example-author-block.html/1.1.6.2/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/example-recent-stories.html/1.1.6.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/example-user-feed.html/1.1.6.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/example-users-by-role.html/1.1.6.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/field.html/1.2/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/filter.html/1.3/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/getting-started.html/1.8/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/menu.html/1.2.6.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/new.html/1.5.6.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/overrides.html/1.2.6.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/path.html/1.3/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/relationship.html/1.6/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/sort.html/1.2/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/style-comment-rss.html/1.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/style-fields.html/1.3/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/style-grid.html/1.3.6.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/style-list.html/1.3.6.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/style-node-rss.html/1.2/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/style-node.html/1.4.6.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/style-row.html/1.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/style-rss.html/1.2/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/style-summary-unformatted.html/1.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/style-summary.html/1.2/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/style-table.html/1.2/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/style-unformatted.html/1.2/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/style.html/1.4.6.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/theme-css.html/1.3.6.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/updating.html/1.3/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/upgrading.html/1.1.2.2/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/using-theme.html/1.6.6.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/view-type.html/1.5/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views.help.ini/1.18.4.5/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
-/node-term_node-term_data-large.png/1.2/Mon Jan 24 12:36:17 2011/-kb/TDRUPAL-7--3
-/node-term_node-term_data.png/1.2/Mon Jan 24 12:36:17 2011/-kb/TDRUPAL-7--3
-/overview-ui-large.png/1.1/Mon Jan 24 12:36:17 2011/-kb/TDRUPAL-7--3
-/overview-ui-small.png/1.1/Mon Jan 24 12:36:17 2011/-kb/TDRUPAL-7--3
-/style-breakdown-large.png/1.2/Mon Jan 24 12:36:17 2011/-kb/TDRUPAL-7--3
-/style-breakdown.png/1.2/Mon Jan 24 12:36:17 2011/-kb/TDRUPAL-7--3
-/views1-admin-large.png/1.2/Mon Jan 24 12:36:17 2011/-kb/TDRUPAL-7--3
-/views1-admin.png/1.2/Mon Jan 24 12:36:17 2011/-kb/TDRUPAL-7--3
-/views1-changeviewtype-large.png/1.2/Mon Jan 24 12:36:17 2011/-kb/TDRUPAL-7--3
-/views1-changeviewtype.png/1.2/Mon Jan 24 12:36:17 2011/-kb/TDRUPAL-7--3
-/views2-addaview-large.png/1.2/Mon Jan 24 12:36:17 2011/-kb/TDRUPAL-7--3
-/views2-addaview.png/1.2/Mon Jan 24 12:36:17 2011/-kb/TDRUPAL-7--3
-/views2-adddisplay-large.png/1.2/Mon Jan 24 12:36:17 2011/-kb/TDRUPAL-7--3
-/views2-adddisplay.png/1.2/Mon Jan 24 12:36:17 2011/-kb/TDRUPAL-7--3
-/views2-addfields-large.png/1.2/Mon Jan 24 12:36:17 2011/-kb/TDRUPAL-7--3
-/views2-addfields.png/1.2/Mon Jan 24 12:36:17 2011/-kb/TDRUPAL-7--3
-/views2-addfieldsajax-large.png/1.2/Mon Jan 24 12:36:17 2011/-kb/TDRUPAL-7--3
-/views2-addfieldsajax.png/1.2/Mon Jan 24 12:36:17 2011/-kb/TDRUPAL-7--3
-/views2-admin-large.png/1.2/Mon Jan 24 12:36:17 2011/-kb/TDRUPAL-7--3
-/views2-admin.png/1.2/Mon Jan 24 12:36:17 2011/-kb/TDRUPAL-7--3
-/views2-changedisplaystyle-large.png/1.2/Mon Jan 24 12:36:17 2011/-kb/TDRUPAL-7--3
-/views2-changedisplaystyle.png/1.2/Mon Jan 24 12:36:17 2011/-kb/TDRUPAL-7--3
-/views2-fieldspreview-large.png/1.2/Mon Jan 24 12:36:17 2011/-kb/TDRUPAL-7--3
-/views2-fieldspreview.png/1.2/Mon Jan 24 12:36:17 2011/-kb/TDRUPAL-7--3
-/views2-newview-large.png/1.2/Mon Jan 24 12:36:17 2011/-kb/TDRUPAL-7--3
-/views2-newview.png/1.2/Mon Jan 24 12:36:17 2011/-kb/TDRUPAL-7--3
-/views2-rearrangefields-large.png/1.2/Mon Jan 24 12:36:17 2011/-kb/TDRUPAL-7--3
-/views2-rearrangefields.png/1.2/Mon Jan 24 12:36:17 2011/-kb/TDRUPAL-7--3
-/views2-tablestyle-large.png/1.2/Mon Jan 24 12:36:17 2011/-kb/TDRUPAL-7--3
-/views2-tablestyle.png/1.2/Mon Jan 24 12:36:17 2011/-kb/TDRUPAL-7--3
+/node-term_node-term_data-large.png/1.2/Wed Feb 9 04:53:44 2011/-kb/TDRUPAL-7--3
+/node-term_node-term_data.png/1.2/Wed Feb 9 04:53:44 2011/-kb/TDRUPAL-7--3
+/overview-ui-large.png/1.1/Wed Feb 9 04:53:44 2011/-kb/TDRUPAL-7--3
+/overview-ui-small.png/1.1/Wed Feb 9 04:53:44 2011/-kb/TDRUPAL-7--3
+/style-breakdown-large.png/1.2/Wed Feb 9 04:53:44 2011/-kb/TDRUPAL-7--3
+/style-breakdown.png/1.2/Wed Feb 9 04:53:44 2011/-kb/TDRUPAL-7--3
+/views1-admin-large.png/1.2/Wed Feb 9 04:53:44 2011/-kb/TDRUPAL-7--3
+/views1-admin.png/1.2/Wed Feb 9 04:53:44 2011/-kb/TDRUPAL-7--3
+/views1-changeviewtype-large.png/1.2/Wed Feb 9 04:53:44 2011/-kb/TDRUPAL-7--3
+/views1-changeviewtype.png/1.2/Wed Feb 9 04:53:44 2011/-kb/TDRUPAL-7--3
+/views2-addaview-large.png/1.2/Wed Feb 9 04:53:44 2011/-kb/TDRUPAL-7--3
+/views2-addaview.png/1.2/Wed Feb 9 04:53:44 2011/-kb/TDRUPAL-7--3
+/views2-adddisplay-large.png/1.2/Wed Feb 9 04:53:44 2011/-kb/TDRUPAL-7--3
+/views2-adddisplay.png/1.2/Wed Feb 9 04:53:44 2011/-kb/TDRUPAL-7--3
+/views2-addfields-large.png/1.2/Wed Feb 9 04:53:44 2011/-kb/TDRUPAL-7--3
+/views2-addfields.png/1.2/Wed Feb 9 04:53:44 2011/-kb/TDRUPAL-7--3
+/views2-addfieldsajax-large.png/1.2/Wed Feb 9 04:53:44 2011/-kb/TDRUPAL-7--3
+/views2-addfieldsajax.png/1.2/Wed Feb 9 04:53:44 2011/-kb/TDRUPAL-7--3
+/views2-admin-large.png/1.2/Wed Feb 9 04:53:44 2011/-kb/TDRUPAL-7--3
+/views2-admin.png/1.2/Wed Feb 9 04:53:44 2011/-kb/TDRUPAL-7--3
+/views2-changedisplaystyle-large.png/1.2/Wed Feb 9 04:53:44 2011/-kb/TDRUPAL-7--3
+/views2-changedisplaystyle.png/1.2/Wed Feb 9 04:53:44 2011/-kb/TDRUPAL-7--3
+/views2-fieldspreview-large.png/1.2/Wed Feb 9 04:53:44 2011/-kb/TDRUPAL-7--3
+/views2-fieldspreview.png/1.2/Wed Feb 9 04:53:44 2011/-kb/TDRUPAL-7--3
+/views2-newview-large.png/1.2/Wed Feb 9 04:53:44 2011/-kb/TDRUPAL-7--3
+/views2-newview.png/1.2/Wed Feb 9 04:53:44 2011/-kb/TDRUPAL-7--3
+/views2-rearrangefields-large.png/1.2/Wed Feb 9 04:53:44 2011/-kb/TDRUPAL-7--3
+/views2-rearrangefields.png/1.2/Wed Feb 9 04:53:44 2011/-kb/TDRUPAL-7--3
+/views2-tablestyle-large.png/1.2/Wed Feb 9 04:53:44 2011/-kb/TDRUPAL-7--3
+/views2-tablestyle.png/1.2/Wed Feb 9 04:53:44 2011/-kb/TDRUPAL-7--3
D
/sprites.png/1.1/Thu Nov 11 16:11:30 2010/-kb/TDRUPAL-7--3
-/arrow-active.png/1.1/Mon Jan 24 12:36:17 2011/-kb/TDRUPAL-7--3
-/expanded-options.png/1.2/Mon Jan 24 12:36:17 2011/-kb/TDRUPAL-7--3
-/overridden.gif/1.1/Mon Jan 24 12:36:17 2011/-kb/TDRUPAL-7--3
-/status-active.gif/1.1/Mon Jan 24 12:36:17 2011/-kb/TDRUPAL-7--3
+/arrow-active.png/1.1/Wed Feb 9 04:53:44 2011/-kb/TDRUPAL-7--3
+/expanded-options.png/1.2/Wed Feb 9 04:53:44 2011/-kb/TDRUPAL-7--3
+/overridden.gif/1.1/Wed Feb 9 04:53:44 2011/-kb/TDRUPAL-7--3
+/status-active.gif/1.1/Wed Feb 9 04:53:44 2011/-kb/TDRUPAL-7--3
D
/ajax.inc/1.20.4.17/Result of merge//TDRUPAL-7--3
-/view.inc/1.167.4.40/Result of merge//TDRUPAL-7--3
-/admin.inc/1.161.4.88/Result of merge//TDRUPAL-7--3
-/analyze.inc/1.1.6.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/base.inc/1.3.4.6/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/cache.inc/1.25.4.8/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/convert.inc/1.17.4.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/form.inc/1.11.4.3/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/handlers.inc/1.119.4.25/Result of merge//TDRUPAL-7--3
-/plugins.inc/1.156.4.15/Fri Jan 28 23:27:51 2011//TDRUPAL-7--3
-/tabs.inc/1.7.6.3/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
+/admin.inc/1.161.4.90/Result of merge+Wed Feb 9 20:52:02 2011//TDRUPAL-7--3
+/analyze.inc/1.1.6.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/base.inc/1.3.4.9/Wed Feb 9 20:52:02 2011//TDRUPAL-7--3
+/cache.inc/1.25.4.8/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/convert.inc/1.17.4.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/form.inc/1.11.4.3/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/handlers.inc/1.119.4.27/Result of merge//TDRUPAL-7--3
+/plugins.inc/1.156.4.16/Wed Feb 9 20:52:02 2011//TDRUPAL-7--3
+/tabs.inc/1.7.6.3/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/view.inc/1.167.4.43/Result of merge//TDRUPAL-7--3
D
<?php
-// $Id: admin.inc,v 1.161.4.88 2011/01/22 22:55:06 dereine Exp $
+// $Id: admin.inc,v 1.161.4.90 2011/02/04 14:13:16 dereine Exp $
/**
* @file admin.inc
* Provides the Views' administrative interface.
}
else {
if (empty($view->disabled)) {
- $links[] = array('title' => t('disable'), 'href' => "admin/structure/views/view/$view->name/disable");
+ $links[] = array(
+ 'title' => t('disable'),
+ 'href' => "admin/structure/views/view/$view->name/disable",
+ 'query' => array('token' => drupal_get_token('views-disable')),
+ );
}
else {
- $links[] = array('title' => t('enable'), 'href' => "admin/structure/views/view/$view->name/enable");
+ $links[] = array(
+ 'title' => t('enable'),
+ 'href' => "admin/structure/views/view/$view->name/enable",
+ 'query' => array('token' => drupal_get_token('views-enable')),
+ );
}
}
if ($item) {
$handler = $view->display_handler->get_handler($type, $id);
if (empty($handler)) {
- $form['markup'] = array('#value' => t("Error: handler for @table > @field doesn't exist!", array('@table' => $item['table'], '@field' => $item['field'])));
+ $form['markup'] = array('#markup' => t("Error: handler for @table > @field doesn't exist!", array('@table' => $item['table'], '@field' => $item['field'])));
}
else {
$types = views_object_types();
if ($item) {
$handler = $view->display_handler->get_handler($type, $id);
if (empty($handler)) {
- $form['markup'] = array('#value' => t("Error: handler for @table > @field doesn't exist!", array('@table' => $item['table'], '@field' => $item['field'])));
+ $form['markup'] = array('#markup' => t("Error: handler for @table > @field doesn't exist!", array('@table' => $item['table'], '@field' => $item['field'])));
}
else {
$handler->init($view, $item);
if ($item) {
$handler = views_get_handler($item['table'], $item['field'], $type);
if (empty($handler)) {
- $form['markup'] = array('#value' => t("Error: handler for @table > @field doesn't exist!", array('@table' => $item['table'], '@field' => $item['field'])));
+ $form['markup'] = array('#markup' => t("Error: handler for @table > @field doesn't exist!", array('@table' => $item['table'], '@field' => $item['field'])));
}
else {
$handler->init($view, $item);
if ($item) {
$handler = views_get_handler($item['table'], $item['field'], $type);
if (empty($handler)) {
- $form['markup'] = array('#value' => t("Error: handler for @table > @field doesn't exist!", array('@table' => $item['table'], '@field' => $item['field'])));
+ $form['markup'] = array('#markup' => t("Error: handler for @table > @field doesn't exist!", array('@table' => $item['table'], '@field' => $item['field'])));
}
else {
$handler->init($view, $item);
if ($item) {
$handler = views_get_handler($item['table'], $item['field'], $type);
if (empty($handler)) {
- $form['markup'] = array('#value' => t("Error: handler for @table > @field doesn't exist!", array('@table' => $item['table'], '@field' => $item['field'])));
+ $form['markup'] = array('#markup' => t("Error: handler for @table > @field doesn't exist!", array('@table' => $item['table'], '@field' => $item['field'])));
}
else {
$handler->init($view, $item);
* Page callback for the Views enable page.
*/
function views_ui_enable_page($view) {
- $views_status = variable_get('views_defaults', array());
- $views_status[$view->name] = FALSE; // FALSE is enabled
- variable_set('views_defaults', $views_status);
- views_invalidate_cache();
- menu_rebuild();
- drupal_goto('admin/structure/views');
+ if (isset($_GET['token']) && drupal_valid_token($_GET['token'], 'views-enable')) {
+ $views_status = variable_get('views_defaults', array());
+ $views_status[$view->name] = FALSE; // FALSE is enabled
+ variable_set('views_defaults', $views_status);
+ views_invalidate_cache();
+ menu_rebuild();
+ drupal_goto('admin/structure/views');
+ }
+ else {
+ return drupal_access_denied();
+ }
}
/**
* Page callback for the Views enable page
*/
function views_ui_disable_page($view) {
- $views_status = variable_get('views_defaults', array());
- $views_status[$view->name] = TRUE; // True is disabled
- variable_set('views_defaults', $views_status);
- views_invalidate_cache();
- menu_rebuild();
- drupal_goto('admin/structure/views');
+ if (isset($_GET['token']) && drupal_valid_token($_GET['token'], 'views-disable')) {
+ $views_status = variable_get('views_defaults', array());
+ $views_status[$view->name] = TRUE; // True is disabled
+ variable_set('views_defaults', $views_status);
+ views_invalidate_cache();
+ menu_rebuild();
+ drupal_goto('admin/structure/views');
+ }
+ else {
+ return drupal_access_denied();
+ }
}
/**
<?php
-// $Id: base.inc,v 1.3.4.6 2010/12/01 20:05:06 dereine Exp $
+// $Id: base.inc,v 1.3.4.9 2011/02/06 14:29:02 dereine Exp $
/**
* @file
*
* Except for displays, options for the object will be held here.
*/
var $options = array();
+
+ /**
+ * The top object of a view.
+ *
+ * @var view
+ */
+ var $view = NULL;
+
/**
* Information about options for all kinds of purposes will be held here.
* @code
if (!empty($this->view)) {
// Ensure we have a localization plugin.
$this->view->init_localization();
+
+ // Set up default localization keys. Handlers and such set this for us
+ if (empty($localization_keys) && isset($this->localization_keys)) {
+ $localization_keys = $this->localization_keys;
+ }
+ // but plugins don't because there isn't a common init() these days.
+ else if (!empty($this->is_plugin)) {
+ if ($this->plugin_type != 'display') {
+ $localization_keys = array($this->view->current_display);
+ $localization_keys[] = $this->plugin_type;
+ }
+ }
}
foreach ($options as $key => $value) {
foreach ($options as $key => $value) {
$translation_keys = array_merge($keys, array($key));
if (is_array($value)) {
- $this->unpack_translatable($translatable, $storage, $key, $definition, $parents, $translation_keys);
+ $this->unpack_translatable($translatable, $options, $key, $definition, $parents, $translation_keys);
}
else if (!empty($definition[$key]['translatable']) && !empty($value)) {
// Build source data and add to the array
<?php
-// $Id: handlers.inc,v 1.119.4.25 2011/01/22 23:26:59 dereine Exp $
+// $Id: handlers.inc,v 1.119.4.27 2011/02/06 14:29:02 dereine Exp $
/**
* @file handlers.inc
* Defines the various handler objects to help build and display views.
/**
* Instantiate and construct a new handler
*/
-function _views_create_handler($definition, $type = 'handler') {
+function _views_create_handler($definition, $type = 'handler', $handler_type = NULL) {
// debug('Instantiating handler ' . $definition['handler']);
if (empty($definition['handler'])) {
return;
}
$handler->set_definition($definition);
+ if ($type == 'handler') {
+ $handler->is_handler = TRUE;
+ $handler->handler_type = $handler_type;
+ }
+ else {
+ $handler->is_plugin = TRUE;
+ $handler->plugin_type = $type;
+ }
+
// let the handler have something like a constructor.
$handler->construct();
/**
* Prepare a handler's data by checking defaults and such.
*/
-function _views_prepare_handler($definition, $data, $field) {
+function _views_prepare_handler($definition, $data, $field, $type) {
foreach (array('group', 'title', 'title short', 'help', 'real field') as $key) {
if (!isset($definition[$key])) {
// First check the field level
}
}
- return _views_create_handler($definition);
+ return _views_create_handler($definition, 'handler', $type);
}
/**
*/
class views_handler extends views_object {
/**
+ * The top object of a view.
+ *
+ * @var view
+ */
+ var $view = NULL;
+
+ /**
+ * Where the $query object will reside:
+ *
+ * @var views_plugin_query
+ */
+ var $query = NULL;
+
+ /**
* init the handler with necessary data.
* @param $view
* The $view object this handler is attached to.
*/
function init(&$view, &$options) {
$this->view = &$view;
+ $display_id = $this->view->current_display;
+ // Check to see if this handler type is defaulted. Note that
+ // we have to do a lookup because the type is singular but the
+ // option is stored as the plural.
+ $types = views_object_types();
+ $plural = $this->handler_type;
+ if (isset($types[$this->handler_type]['plural'])) {
+ $plural = $types[$this->handler_type]['plural'];
+ }
+ if ($this->view->display_handler->is_defaulted($plural)) {
+ $display_id = 'default';
+ }
+
+ $this->localization_keys = array(
+ $display_id,
+ $this->handler_type,
+ $options['table'],
+ $options['field']
+ );
+
$this->unpack_options($this->options, $options);
// This exist on most handlers, but not all. So they are still optional.
<?php
-// $Id: plugins.inc,v 1.156.4.15 2011/01/18 20:53:08 merlinofchaos Exp $
+// $Id: plugins.inc,v 1.156.4.16 2011/02/05 16:50:37 dereine Exp $
/**
* @file plugins.inc
* Built in plugins for Views output handling.
*/
class views_plugin extends views_object {
/**
+ * The top object of a view.
+ *
+ * @var view
+ */
+ var $view = NULL;
+
+ /**
+ * The current used display plugin.
+ *
+ * @var views_plugin_display
+ */
+ var $display = NULL;
+
+ /**
* Init will be called after construct, when the plugin is attached to a
* view and a display.
*/
<?php
-// $Id: view.inc,v 1.167.4.40 2011/01/05 21:20:09 dereine Exp $
+// $Id: view.inc,v 1.167.4.43 2011/02/06 14:29:02 dereine Exp $
/**
* @file view.inc
* Provides the view object type and associated methods.
// Used to store views that were previously running if we recurse.
var $old_view = array();
- // Where the $query object will reside:
+ /**
+ * Where the $query object will reside:
+ *
+ * @var views_plugin_query
+ */
var $query = NULL;
+ /**
+ * The current used display plugin.
+ *
+ * @var views_plugin_display
+ */
+ var $display_handler;
+
+ /**
+ * The current used style plugin.
+ *
+ * @var views_plugin_style
+ */
+ var $style_plugin;
+
/**
* Constructor
*/
}
$this->display[$id]->handler = views_get_plugin('display', $this->display[$id]->display_plugin);
if (!empty($this->display[$id]->handler)) {
+ $this->display[$id]->handler->localization_keys = array($id);
// Initialize the new display handler with data.
$this->display[$id]->handler->init($this, $this->display[$id]);
// If this is NOT the default display handler, let it know which is
* The name of the view or its internal view id (vid)
* @param $reset
* If TRUE, reset this entry in the load cache.
- * @return A view object or NULL if it was not available.
+ * @return view
+ * A view object or NULL if it was not available.
*/
static function &load($arg, $reset = FALSE) {
static $cache = array();
* view. This gets ugly fast.
*
* This will completely wipe a view clean so it can be considered fresh.
+ *
+ * @return view
+ * The cloned view.
*/
function clone_view() {
$clone = version_compare(phpversion(), '5.0') < 0 ? $this : clone($this);
$this->display[$display_id]->handler->destroy();
unset($this->display[$display_id]->handler);
}
+ }
- foreach (views_object_types() as $type => $info) {
- if (isset($this->$type)) {
- $handlers = &$this->$type;
- foreach ($handlers as $id => $item) {
- $handlers[$id]->destroy();
- }
- unset($handlers);
+ foreach (views_object_types() as $type => $info) {
+ if (isset($this->$type)) {
+ $handlers = &$this->$type;
+ foreach ($handlers as $id => $item) {
+ $handlers[$id]->destroy();
}
+ unset($handlers);
}
+ }
- if (isset($this->style_plugin)) {
- $this->style_plugin->destroy();
- unset($this->style_plugin);
- }
+ if (isset($this->style_plugin)) {
+ $this->style_plugin->destroy();
+ unset($this->style_plugin);
+ }
- // Clear these to make sure the view can be processed/used again.
- if (isset($this->display_handler)) {
- unset($this->display_handler);
- }
+ // Clear these to make sure the view can be processed/used again.
+ if (isset($this->display_handler)) {
+ unset($this->display_handler);
+ }
- if (isset($this->current_display)) {
- unset($this->current_display);
- }
+ if (isset($this->current_display)) {
+ unset($this->current_display);
+ }
- if (isset($this->query)) {
- unset($this->query);
- }
+ if (isset($this->query)) {
+ unset($this->query);
+ }
- $keys = array('current_display', 'display_handler', 'build_info', 'built', 'executed', 'attachment_before', 'attachment_after', 'field', 'argument', 'filter', 'sort', 'relationship', 'header', 'footer', 'empty', 'query', 'result', 'inited', 'style_plugin', 'plugin_name', 'exposed_data', 'exposed_input', 'many_to_one_tables');
- foreach ($keys as $key) {
- if (isset($this->$key)) {
- unset($this->$key);
- }
+ $keys = array('current_display', 'display_handler', 'build_info', 'built', 'executed', 'attachment_before', 'attachment_after', 'field', 'argument', 'filter', 'sort', 'relationship', 'header', 'footer', 'empty', 'query', 'result', 'inited', 'style_plugin', 'plugin_name', 'exposed_data', 'exposed_input', 'many_to_one_tables');
+ foreach ($keys as $key) {
+ if (isset($this->$key)) {
+ unset($this->$key);
}
- $this->built = $this->executed = FALSE;
- $this->build_info = array();
- $this->attachment_before = '';
- $this->attachment_after = '';
}
+ $this->built = $this->executed = FALSE;
+ $this->build_info = array();
+ $this->attachment_before = '';
+ $this->attachment_after = '';
}
/**
* The title of the display; optional, may be filled in from default.
* @param $id
* The id to use.
- * @return
+ * @return views_plugin_display
* A reference to the new handler object.
*/
function &new_display($type = 'page', $title = NULL, $id = NULL) {
-/ajax.js/1.26.4.12/Thu Nov 11 16:11:30 2010//TDRUPAL-7--3
-/ajax_view.js/1.19.4.5/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
/base.js/1.11.4.5/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/tabs.js/1.4.4.4/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
+/ajax.js/1.26.4.13/Result of merge//TDRUPAL-7--3
+/ajax_view.js/1.19.4.5/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/tabs.js/1.4.4.4/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
D
-// $Id: ajax.js,v 1.26.4.12 2010/08/03 05:54:01 dereine Exp $
+// $Id: ajax.js,v 1.26.4.13 2011/02/04 22:36:27 merlinofchaos Exp $
/**
* @file ajax_admin.js
*
// Update the preview widget to preview the new tab.
var display_id = id.replace('#views-tab-', '');
$("#preview-display-id").append('<option selected="selected" value="' + display_id + '">' + response.title + '</option>');
-
+
Drupal.attachBehaviors(id);
var instance = $.viewsUi.tabs.instances[$('#views-tabset').get(0).UI_TABS_UUID];
$('#views-tabset').viewsClickTab(instance.$tabs.length);
D/translation////
D/upload////
D/user////
-/aggregator.views.inc/1.3.4.7/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/book.views.inc/1.5.6.4/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/book.views_convert.inc/1.3.4.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/comment.views.inc/1.33.4.17/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/comment.views_convert.inc/1.4.4.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/comment.views_default.inc/1.7.6.7/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/contact.views.inc/1.1.6.2/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/field.views.inc/1.1.2.20/Fri Jan 28 23:27:51 2011//TDRUPAL-7--3
-/filter.views.inc/1.1.6.2/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/locale.views.inc/1.1.6.2/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
/node.views.inc/1.97.4.25/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/node.views_convert.inc/1.7.4.2/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/node.views_default.inc/1.11.6.5/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/poll.views.inc/1.4.6.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/profile.views.inc/1.10.4.8/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/profile.views_convert.inc/1.2.4.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/search.views.inc/1.18.4.3/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/search.views_convert.inc/1.2.4.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/search.views_default.inc/1.6.6.4/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/statistics.views.inc/1.9.6.3/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/statistics.views_convert.inc/1.1.6.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/statistics.views_default.inc/1.5.6.5/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/system.views.inc/1.7.6.8/Fri Jan 28 23:27:51 2011//TDRUPAL-7--3
-/taxonomy.views.inc/1.57.4.19/Fri Jan 28 23:27:51 2011//TDRUPAL-7--3
-/taxonomy.views_convert.inc/1.4.4.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/taxonomy.views_default.inc/1.3.6.4/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/translation.views.inc/1.8.6.5/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/upload.views.inc/1.16.4.5/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/upload.views_convert.inc/1.4.4.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/user.views.inc/1.59.4.15/Fri Jan 28 23:27:51 2011//TDRUPAL-7--3
-/user.views_convert.inc/1.3.4.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views.views.inc/1.7.4.4/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
+/aggregator.views.inc/1.3.4.7/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/book.views.inc/1.5.6.4/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/book.views_convert.inc/1.3.4.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/comment.views.inc/1.33.4.17/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/comment.views_convert.inc/1.4.4.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/comment.views_default.inc/1.7.6.7/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/contact.views.inc/1.1.6.2/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/field.views.inc/1.1.2.20/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/filter.views.inc/1.1.6.2/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/locale.views.inc/1.1.6.2/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/node.views_convert.inc/1.7.4.2/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/node.views_default.inc/1.11.6.5/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/poll.views.inc/1.4.6.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/profile.views.inc/1.10.4.8/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/profile.views_convert.inc/1.2.4.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/search.views.inc/1.18.4.3/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/search.views_convert.inc/1.2.4.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/search.views_default.inc/1.6.6.4/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/statistics.views.inc/1.9.6.3/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/statistics.views_convert.inc/1.1.6.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/statistics.views_default.inc/1.5.6.5/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/system.views.inc/1.7.6.8/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/taxonomy.views.inc/1.57.4.19/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/taxonomy.views_convert.inc/1.4.4.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/taxonomy.views_default.inc/1.3.6.4/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/translation.views.inc/1.8.6.5/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/upload.views.inc/1.16.4.5/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/upload.views_convert.inc/1.4.4.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/user.views.inc/1.59.4.15/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/user.views_convert.inc/1.3.4.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views.views.inc/1.7.4.4/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
/views_handler_field_aggregator_category.inc/1.1.6.1/Thu Jan 6 23:29:45 2011//TDRUPAL-7--3
/views_handler_field_aggregator_title_link.inc/1.1.6.1/Thu Jan 6 23:29:45 2011//TDRUPAL-7--3
-/views_handler_argument_aggregator_category_cid.inc/1.1.6.2/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_argument_aggregator_fid.inc/1.1.6.2/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_argument_aggregator_iid.inc/1.1.6.2/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_field_aggregator_xss.inc/1.1.2.2/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_filter_aggregator_category_cid.inc/1.2.4.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_plugin_row_aggregator_rss.inc/1.1.6.2/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
+/views_handler_argument_aggregator_category_cid.inc/1.1.6.2/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_argument_aggregator_fid.inc/1.1.6.2/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_argument_aggregator_iid.inc/1.1.6.2/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_field_aggregator_xss.inc/1.1.2.2/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_filter_aggregator_category_cid.inc/1.2.4.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_plugin_row_aggregator_rss.inc/1.1.6.2/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
D
/views_handler_field_comment_username.inc/1.2.6.1/Thu Jan 6 23:29:45 2011//TDRUPAL-7--3
/views_handler_field_node_new_comments.inc/1.7.4.4/Thu Jan 6 23:29:45 2011//TDRUPAL-7--3
/views_handler_field_comment_link.inc/1.2.6.3/Result of merge//TDRUPAL-7--3
-/views_handler_argument_comment_user_uid.inc/1.2.4.4/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_field_comment_depth.inc/1.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_field_comment_link_delete.inc/1.1.6.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_field_comment_link_reply.inc/1.1.6.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_field_last_comment_timestamp.inc/1.1.6.2/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_field_ncs_last_comment_name.inc/1.1.6.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_field_ncs_last_updated.inc/1.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_field_node_comment.inc/1.1.6.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_filter_comment_user_uid.inc/1.2.4.2/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_filter_ncs_last_updated.inc/1.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_filter_node_comment.inc/1.1.6.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_sort_comment_thread.inc/1.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_sort_ncs_last_comment_name.inc/1.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_sort_ncs_last_updated.inc/1.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_plugin_row_comment_rss.inc/1.3.6.3/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_plugin_row_comment_view.inc/1.1.6.2/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
+/views_handler_argument_comment_user_uid.inc/1.2.4.4/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_field_comment_depth.inc/1.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_field_comment_link_delete.inc/1.1.6.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_field_comment_link_reply.inc/1.1.6.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_field_last_comment_timestamp.inc/1.1.6.2/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_field_ncs_last_comment_name.inc/1.1.6.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_field_ncs_last_updated.inc/1.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_field_node_comment.inc/1.1.6.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_filter_comment_user_uid.inc/1.2.4.2/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_filter_ncs_last_updated.inc/1.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_filter_node_comment.inc/1.1.6.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_sort_comment_thread.inc/1.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_sort_ncs_last_comment_name.inc/1.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_sort_ncs_last_updated.inc/1.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_plugin_row_comment_rss.inc/1.3.6.3/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_plugin_row_comment_view.inc/1.1.6.2/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
D
-/views_handler_field_contact_link.inc/1.2.4.5/Thu Jan 6 23:31:40 2011//TDRUPAL-7--3
+/views_handler_field_contact_link.inc/1.2.4.6/Result of merge//TDRUPAL-7--3
D
<?php
-// $Id: views_handler_field_contact_link.inc,v 1.2.4.5 2010/12/23 05:44:54 dereine Exp $
+// $Id: views_handler_field_contact_link.inc,v 1.2.4.6 2011/02/06 14:11:49 dereine Exp $
/**
* A field that links to the user contact page, if access is permitted.
*/
// Check access when we pull up the user account so we know
// if the user has made the contact page available.
- if (!_contact_personal_tab_access($account) || empty($account->contact)) {
+ $menu_item = menu_get_item("user/$uid/contact");
+ if (!$menu_item['access'] || empty($account->contact)) {
return;
}
-/views_handler_field_field.inc/1.1.2.29/Result of merge//TDRUPAL-7--3
-/views_handler_filter_field_list.inc/1.1.2.2/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
+/views_handler_field_field.inc/1.1.2.31/Result of merge//TDRUPAL-7--3
+/views_handler_filter_field_list.inc/1.1.2.2/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
D
<?php
-// $Id: views_handler_field_field.inc,v 1.1.2.29 2011/01/26 21:20:12 dereine Exp $
+// $Id: views_handler_field_field.inc,v 1.1.2.31 2011/02/04 12:03:56 dereine Exp $
/**
* Helper function: Return an array of formatter options for a field type.
*/
public $items = array();
- function init(&$view, $options) {
+ function init(&$view, &$options) {
parent::init($view, $options);
$field = $this->definition['field_info'];
foreach ($this->view->relationship as $relationship) {
if ($relationship->alias == $this->relationship) {
$base_table = $relationship->definition['base'];
- $base_field = $relationship->definition['base field'];
$base_table_alias = $relationship->alias;
+
+ $table_data = views_fetch_data($base_table);
+ $base_field = empty($relationship->definition['base field']) ? $table_data['table']['base']['field'] : $relationship->definition['base field'];
}
}
}
-/views_handler_field_filter_format_name.inc/1.2.4.2/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
+/views_handler_field_filter_format_name.inc/1.2.4.2/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
D
/views_handler_field_locale_link_edit.inc/1.1.6.2/Thu Jan 6 23:31:40 2011//TDRUPAL-7--3
-/views_handler_argument_locale_group.inc/1.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_argument_locale_language.inc/1.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_field_locale_group.inc/1.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_field_locale_language.inc/1.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_filter_locale_group.inc/1.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_filter_locale_language.inc/1.1.6.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_filter_locale_version.inc/1.1.6.2/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
+/views_handler_argument_locale_group.inc/1.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_argument_locale_language.inc/1.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_field_locale_group.inc/1.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_field_locale_language.inc/1.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_filter_locale_group.inc/1.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_filter_locale_language.inc/1.1.6.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_filter_locale_version.inc/1.1.6.2/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
D
/views_handler_field_node_path.inc/1.1.6.2/Thu Jan 6 23:29:45 2011//TDRUPAL-7--3
/views_handler_field_node_revision.inc/1.1.6.3/Thu Jan 6 23:29:45 2011//TDRUPAL-7--3
/views_handler_field_node_type.inc/1.2.4.4/Thu Jan 6 23:29:45 2011//TDRUPAL-7--3
-/views_handler_filter_history_user_timestamp.inc/1.3.4.6/Fri Jan 14 23:25:06 2011//TDRUPAL-7--3
-/views_handler_argument_dates_various.inc/1.4.6.3/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_argument_node_language.inc/1.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_argument_node_nid.inc/1.1.6.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_argument_node_type.inc/1.2.4.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_argument_node_vid.inc/1.1.6.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_field_node_link_delete.inc/1.1.6.2/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_field_node_link_edit.inc/1.1.6.2/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_field_node_revision_link_delete.inc/1.1.6.2/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_field_node_revision_link_revert.inc/1.1.6.2/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_filter_node_access.inc/1.2.4.2/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_filter_node_status.inc/1.2.4.7/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_filter_node_type.inc/1.2.4.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_plugin_argument_default_node.inc/1.1.6.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_plugin_argument_validate_node.inc/1.2.4.4/Fri Jan 28 23:27:52 2011//TDRUPAL-7--3
-/views_plugin_row_node_rss.inc/1.7.4.7/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_plugin_row_node_view.inc/1.3.6.3/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
+/views_handler_argument_dates_various.inc/1.4.6.3/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_argument_node_language.inc/1.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_argument_node_nid.inc/1.1.6.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_argument_node_type.inc/1.2.4.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_argument_node_vid.inc/1.1.6.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_field_node_link_delete.inc/1.1.6.2/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_field_node_link_edit.inc/1.1.6.2/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_field_node_revision_link_delete.inc/1.1.6.2/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_field_node_revision_link_revert.inc/1.1.6.2/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_filter_history_user_timestamp.inc/1.3.4.8/Result of merge+Wed Feb 9 20:52:02 2011//TDRUPAL-7--3
+/views_handler_filter_node_access.inc/1.2.4.2/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_filter_node_status.inc/1.2.4.7/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_filter_node_type.inc/1.2.4.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_plugin_argument_default_node.inc/1.1.6.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_plugin_argument_validate_node.inc/1.2.4.5/Wed Feb 9 20:52:02 2011//TDRUPAL-7--3
+/views_plugin_row_node_rss.inc/1.7.4.8/Wed Feb 9 20:52:02 2011//TDRUPAL-7--3
+/views_plugin_row_node_view.inc/1.3.6.3/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
D
<?php
-// $Id: views_handler_filter_history_user_timestamp.inc,v 1.3.4.5 2011/01/07 18:10:54 dereine Exp $
+// $Id: views_handler_filter_history_user_timestamp.inc,v 1.3.4.8 2011/02/04 22:36:27 merlinofchaos Exp $
+
/**
* Filter for new content
*
// Don't display empty space where the operator would be.
var $no_operator = TRUE;
- function expose_form_right() {
+ function expose_form_right(&$form, &$form_state) {
// We don't want any of the usual options for exposed filters.
}
$field = "$this->table_alias.$this->real_field";
$node = $this->query->ensure_table('node', $this->relationship);
+ $clause = '';
+ $clause2 = '';
if (module_exists('comment')) {
$ncs = $this->query->ensure_table('node_comment_statistics', $this->relationship);
$clause = ("OR $ncs.last_comment_timestamp > (***CURRENT_TIME*** - $limit)");
<?php
-// $Id: views_plugin_argument_validate_node.inc,v 1.2.4.4 2011/01/18 21:52:17 merlinofchaos Exp $
+// $Id: views_plugin_argument_validate_node.inc,v 1.2.4.5 2011/02/06 14:23:20 dereine Exp $
/**
* @file
* Contains the 'node' argument validator plugin.
case 'nids':
$nids = new stdClass();
$nids->value = array($argument);
- $nids = views_nid_type($argument, $nids);
+ $nids = views_break_phrase($argument, $nids);
if ($nids->value == -1) {
return FALSE;
}
<?php
-// $Id: views_plugin_row_node_rss.inc,v 1.7.4.7 2010/11/11 19:41:11 dereine Exp $
+// $Id: views_plugin_row_node_rss.inc,v 1.7.4.8 2011/02/08 22:36:01 dereine Exp $
/**
* @file
* Contains the node RSS row style plugin.
$item_text = '';
- $node->rss_namespaces = array();
+ $node->rss_namespaces = array('xmlns:dc' => 'http://purl.org/dc/elements/1.1/');
$node->rss_elements = array(
array('key' => 'pubDate', 'value' => gmdate('r', $node->created)),
- array('key' => 'dc:creator', 'value' => $node->name, 'namespace' => array('xmlns:dc' => 'http://purl.org/dc/elements/1.1/')),
+ array('key' => 'dc:creator', 'value' => $node->name),
array('key' => 'guid', 'value' => $node->nid . ' at ' . $base_url, 'attributes' => array('isPermaLink' => 'false'))
);
// and $node->rss_namespaces.
node_build_content($node, 'rss');
- foreach ($node->rss_elements as $element) {
- if (isset($element['namespace'])) {
- $this->view->style_plugin->namespaces = array_merge($this->view->style_plugin->namespaces, $element['namespace']);
- }
- }
+ $this->view->style_plugin->namespaces = array_merge($this->view->style_plugin->namespaces, $node->rss_namespaces);
if ($item_length != 'title' && !empty($node->content)) {
// We render node contents and force links to be last.
-/views_handler_field_profile_date.inc/1.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_field_profile_list.inc/1.4.4.4/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_filter_profile_selection.inc/1.1.6.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
+/views_handler_field_profile_date.inc/1.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_field_profile_list.inc/1.4.4.4/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_filter_profile_selection.inc/1.1.6.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
D
-/views_handler_argument_search.inc/1.1.2.2/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_field_search_score.inc/1.2.6.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_filter_search.inc/1.5.6.2/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_sort_search_score.inc/1.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_plugin_row_search_view.inc/1.1.6.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
+/views_handler_argument_search.inc/1.1.2.2/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_field_search_score.inc/1.2.6.2/Wed Feb 9 20:52:02 2011//TDRUPAL-7--3
+/views_handler_filter_search.inc/1.5.6.4/Wed Feb 9 20:52:02 2011//TDRUPAL-7--3
+/views_handler_sort_search_score.inc/1.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_plugin_row_search_view.inc/1.1.6.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
D
<?php
-// $Id: views_handler_field_search_score.inc,v 1.2.6.1 2010/12/09 21:31:10 merlinofchaos Exp $
+// $Id: views_handler_field_search_score.inc,v 1.2.6.2 2011/02/05 00:44:01 merlinofchaos Exp $
/**
* Field handler to provide simple renderer that allows linking to a node.
$form['alternate_sort'] = array(
'#type' => 'select',
'#title' => t('Alternative sort'),
- '#description' => t('If no search is performed and this field does not appear, pick an alternative default table sort field.'),
+ '#description' => t('Pick an alternative default table sort field to use when the search score field is unavailable.'),
'#options' => $options,
'#default_value' => $this->options['alternate_sort'],
);
<?php
-// $Id: views_handler_filter_search.inc,v 1.5.6.2 2009/12/24 00:37:00 merlinofchaos Exp $
+// $Id: views_handler_filter_search.inc,v 1.5.6.4 2011/02/08 22:50:11 dereine Exp $
/**
* Field handler to provide simple renderer that allows linking to a node.
*/
class views_handler_filter_search extends views_handler_filter {
var $no_single = TRUE;
+
+ /**
+ * Stores a viewsSearchQuery object to be able to use the search.module "api".
+ *
+ * @var viewsSearchQuery
+ */
+ var $search_query = NULL;
+
function option_definition() {
$options = parent::option_definition();
/**
* Validate the options form.
*/
- function exposed_validate($form, &$form_state) {
+ function exposed_validate(&$form, &$form_state) {
if (!isset($this->options['expose']['identifier'])) {
return;
}
$key = $this->options['expose']['identifier'];
if (!empty($form_state['values'][$key])) {
- $this->search_query = search_parse_query($form_state['values'][$key]);
-
- if ($this->search_query[2] == '') {
- form_set_error($key, t('You must include at least one positive keyword with @count characters or more.', array('@count' => variable_get('minimum_word_size', 3))));
- }
- if ($this->search_query[6]) {
- if ($this->search_query[6] == 'or') {
- drupal_set_message(t('Search for either of the two terms with uppercase <strong>OR</strong>. For example, <strong>cats OR dogs</strong>.'));
- }
+ $this->query_parse_search_expression($form_state['values'][$key]);
+ if (count($this->search_query->words()) == 0) {
+ form_set_error($key, format_plural(variable_get('minimum_word_size', 3), 'You must include at least one positive keyword with 1 character or more.', 'You must include at least one positive keyword with @count characters or more.'));
}
}
}
/**
+ * Take sure that parseSearchExpression is runned and everything is set up for it.
+ *
+ * @param $input
+ * The search phrase which was input by the user.
+ */
+ function query_parse_search_expression($input) {
+ if (!isset($this->search_query)) {
+ $this->search_query = db_select('search_index', 'i', array('target' => 'slave'))->extend('viewsSearchQuery');
+ $this->search_query->searchExpression($input, $this->view->base_table);
+ $this->search_query->publicParseSearchExpression();
+ }
+ }
+
+ /**
* Add this filter to the query.
*
* Due to the nature of fapi, the value and the operator have an unintended
* and $this->value respectively.
*/
function query() {
- if (!isset($this->search_query) || empty($this->search_query[3])) {
+ $required = FALSE;
+ if (!isset($this->search_query)) {
+ $required = TRUE;
+ }
+ else {
+ $words = $this->search_query->words();
+ if (empty($words)) {
+ $required = TRUE;
+ }
+ }
+ if ($required) {
if ($this->operator == 'required') {
$this->query->add_where($this->options['group'], 'FALSE');
}
}
else {
$search_index = $this->ensure_my_table();
- $this->search_query[2] = str_replace('i.', "$search_index.", $this->search_query[2]);
+
+ $or = db_or();
+ foreach ($words as $word) {
+ $or->condition("$search_index.word", $word);
+ }
// Create a new join to relate the 'serach_total' table to our current 'search_index' table.
$join = new views_join;
$this->search_score = $this->query->add_field('', "SUM($search_index.score * $search_total.count)", 'score', array('aggregate' => TRUE));
- $this->query->add_where($this->options['group'], $this->search_query[2], $this->search_query[3]);
+ $this->query->add_where($this->options['group'], $or);
if (empty($this->query->relationships[$this->relationship])) {
$base_table = $this->query->base_table;
else {
$base_table = $this->query->relationships[$this->relationship]['base'];
}
- $this->query->add_where($this->options['group'], "$search_index.type = '%s'", $base_table);
- if (!$this->search_query[5]) {
+ $this->query->add_where($this->options['group'], "$search_index.type", $base_table);
+ if (!$this->search_query->simple()) {
$search_dataset = $this->query->add_table('search_dataset');
- $this->search_query[0] = str_replace('d.', "$search_dataset.", $this->search_query[0]);
- $this->query->add_where($this->options['group'], $this->search_query[0], $this->search_query[1]);
+ $conditions = $this->search_query->conditions();
+ $condition_conditions =& $conditions->conditions();
+ foreach ($condition_conditions as $key => &$condition) {
+ // Take sure we just look at real conditions.
+ if (is_numeric($key)) {
+ // Replace the conditions with the table alias of views.
+ $this->condition_replace_string('d.', "$search_dataset.", $condition);
+ }
+ }
+ $this->query->add_where($this->options['group'], $conditions);
}
$this->query->add_groupby("$search_index.sid");
- $this->query->add_having($this->options['group'], 'COUNT(*)', $this->search_query[4], '>=');
+ $matches = $this->search_query->matches();
+ $placeholder = $this->placeholder();
+ $this->query->add_having_expression($this->options['group'], "COUNT(*) >= $placeholder", array($placeholder => $matches));
+ }
+ }
+
+ function condition_replace_string($search, $replace, &$condition) {
+ if ($condition['field'] instanceof DatabaseCondition) {
+ $conditions =& $condition['field']->conditions();
+ foreach ($conditions as $key => &$subcondition) {
+ if (is_numeric($key)) {
+ $this->condition_replace_string($search, $replace, $subcondition);
+ }
+ }
+ }
+ else {
+ $condition['field'] = str_replace($search, $replace, $condition['field']);
}
}
}
+
+class viewsSearchQuery extends searchQuery {
+ public function &conditions() {
+ return $this->conditions;
+ }
+ public function words() {
+ return $this->words;
+ }
+
+ public function simple() {
+ return $this->simple;
+ }
+
+ public function matches() {
+ return $this->matches;
+ }
+
+ public function publicParseSearchExpression() {
+ return $this->parseSearchExpression();
+ }
+}
\ No newline at end of file
/views_handler_field_file.inc/1.3.6.3/Thu Jan 6 23:29:45 2011//TDRUPAL-7--3
/views_handler_field_file_filemime.inc/1.1.2.1/Thu Jan 6 23:29:45 2011//TDRUPAL-7--3
/views_handler_field_file_uri.inc/1.1.2.1/Thu Jan 6 23:29:45 2011//TDRUPAL-7--3
-/views_handler_argument_file_fid.inc/1.1.6.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_field_file_extension.inc/1.1.4.2/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_field_file_status.inc/1.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_filter_file_status.inc/1.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_filter_system_type.inc/1.1.4.2/Sat Jan 22 22:49:09 2011//TDRUPAL-7--3
+/views_handler_argument_file_fid.inc/1.1.6.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_field_file_extension.inc/1.1.4.2/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_field_file_status.inc/1.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_filter_file_status.inc/1.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_filter_system_type.inc/1.1.4.2/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
D
/views_handler_field_term_link_edit.inc/1.1.4.3/Thu Jan 6 23:31:40 2011//TDRUPAL-7--3
/views_handler_field_term_node_tid.inc/1.4.4.10/Thu Jan 6 23:31:40 2011//TDRUPAL-7--3
/views_handler_relationship_node_term_data.inc/1.3.4.3/Thu Jan 6 23:29:45 2011//TDRUPAL-7--3
-/views_handler_argument_taxonomy.inc/1.1.6.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_argument_term_node_tid.inc/1.1.6.5/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_argument_term_node_tid_depth_modifier.inc/1.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_argument_vocabulary_vid.inc/1.1.6.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_filter_term_node_tid.inc/1.8.6.14/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_filter_term_node_tid_depth.inc/1.1.6.4/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_filter_vocabulary_machine_name.inc/1.1.2.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_filter_vocabulary_vid.inc/1.3.4.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_plugin_argument_default_taxonomy_tid.inc/1.1.2.9/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_plugin_argument_validate_taxonomy_term.inc/1.6.4.9/Fri Jan 28 23:27:52 2011//TDRUPAL-7--3
+/views_handler_argument_taxonomy.inc/1.1.6.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_argument_term_node_tid.inc/1.1.6.5/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_argument_term_node_tid_depth_modifier.inc/1.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_argument_vocabulary_vid.inc/1.1.6.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_filter_term_node_tid.inc/1.8.6.14/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_filter_term_node_tid_depth.inc/1.1.6.4/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_filter_vocabulary_machine_name.inc/1.1.2.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_filter_vocabulary_vid.inc/1.3.4.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_plugin_argument_default_taxonomy_tid.inc/1.1.2.9/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_plugin_argument_validate_taxonomy_term.inc/1.6.4.9/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
D
-/views_handler_argument_node_tnid.inc/1.1.6.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_field_node_language.inc/1.2/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_field_node_link_translate.inc/1.1.6.2/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_field_node_translation_link.inc/1.1.6.3/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_filter_node_language.inc/1.1.6.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_filter_node_tnid.inc/1.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_filter_node_tnid_child.inc/1.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_relationship_translation.inc/1.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
+/views_handler_argument_node_tnid.inc/1.1.6.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_field_node_language.inc/1.2/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_field_node_link_translate.inc/1.1.6.2/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_field_node_translation_link.inc/1.1.6.3/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_filter_node_language.inc/1.1.6.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_filter_node_tnid.inc/1.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_filter_node_tnid_child.inc/1.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_relationship_translation.inc/1.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
D
-/views_handler_field_upload_description.inc/1.5.4.3/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_field_upload_fid.inc/1.10.4.5/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_filter_upload_fid.inc/1.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
+/views_handler_field_upload_description.inc/1.5.4.3/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_field_upload_fid.inc/1.10.4.5/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_filter_upload_fid.inc/1.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
D
/views_handler_field_user_link.inc/1.1.6.2/Thu Jan 6 23:31:40 2011//TDRUPAL-7--3
/views_handler_field_user_mail.inc/1.1.6.1/Thu Jan 6 23:29:45 2011//TDRUPAL-7--3
/views_handler_field_user_name.inc/1.2.6.3/Thu Jan 6 23:29:45 2011//TDRUPAL-7--3
-/views_handler_argument_user_uid.inc/1.1.6.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_argument_users_roles_rid.inc/1.1.6.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_field_user_language.inc/1.1.6.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_field_user_link_cancel.inc/1.1.2.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_field_user_link_delete.inc/1.1.6.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_field_user_link_edit.inc/1.1.6.2/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_field_user_picture.inc/1.1.6.5/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_field_user_roles.inc/1.2.4.2/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_filter_user_current.inc/1.2.4.2/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_filter_user_name.inc/1.2.6.2/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_filter_user_roles.inc/1.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_plugin_argument_default_current_user.inc/1.1.6.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_plugin_argument_default_user.inc/1.1.6.3/Fri Jan 28 23:27:52 2011//TDRUPAL-7--3
-/views_plugin_argument_validate_user.inc/1.2.6.10/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
+/views_handler_argument_user_uid.inc/1.1.6.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_argument_users_roles_rid.inc/1.1.6.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_field_user_language.inc/1.1.6.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_field_user_link_cancel.inc/1.1.2.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_field_user_link_delete.inc/1.1.6.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_field_user_link_edit.inc/1.1.6.2/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_field_user_picture.inc/1.1.6.5/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_field_user_roles.inc/1.2.4.2/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_filter_user_current.inc/1.2.4.2/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_filter_user_name.inc/1.2.6.2/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_filter_user_roles.inc/1.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_plugin_argument_default_current_user.inc/1.1.6.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_plugin_argument_default_user.inc/1.1.6.3/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_plugin_argument_validate_user.inc/1.2.6.10/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
D
-/views_plugin_access.inc/1.1.6.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_plugin_access_none.inc/1.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_plugin_access_perm.inc/1.3.6.3/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_plugin_access_role.inc/1.2.6.3/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_plugin_argument_default.inc/1.2.4.2/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_plugin_argument_default_fixed.inc/1.1.4.2/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_plugin_argument_default_php.inc/1.1.6.4/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_plugin_argument_validate.inc/1.2.4.2/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_plugin_argument_validate_numeric.inc/1.1.6.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_plugin_argument_validate_php.inc/1.1.6.2/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_plugin_cache.inc/1.5.4.5/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_plugin_cache_none.inc/1.2.4.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_plugin_cache_time.inc/1.3.4.4/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_plugin_display.inc/1.27.4.52/Result of merge//TDRUPAL-7--3
-/views_plugin_display_attachment.inc/1.6.4.3/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_plugin_display_block.inc/1.5.4.3/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_plugin_display_default.inc/1.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_plugin_display_feed.inc/1.7.4.5/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_plugin_display_page.inc/1.8.4.14/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_plugin_exposed_form.inc/1.2.2.18/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_plugin_exposed_form_basic.inc/1.2.2.2/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_plugin_exposed_form_input_required.inc/1.2.2.8/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_plugin_localization.inc/1.1.4.2/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_plugin_localization_core.inc/1.1.4.2/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_plugin_localization_none.inc/1.1.4.2/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_plugin_pager.inc/1.1.4.7/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_plugin_pager_full.inc/1.1.4.14/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_plugin_pager_mini.inc/1.1.4.5/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_plugin_pager_none.inc/1.1.4.3/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_plugin_pager_some.inc/1.1.4.3/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_plugin_query.inc/1.1.4.13/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_plugin_query_default.inc/1.1.4.39/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_plugin_row.inc/1.4.4.4/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_plugin_row_fields.inc/1.2.4.4/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_plugin_style.inc/1.8.4.10/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_plugin_style_default.inc/1.2/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_plugin_style_grid.inc/1.1.6.2/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_plugin_style_jump_menu.inc/1.1.6.7/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_plugin_style_list.inc/1.1.6.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_plugin_style_rss.inc/1.2.6.7/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_plugin_style_summary.inc/1.1.6.6/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_plugin_style_summary_jump_menu.inc/1.1.6.6/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_plugin_style_summary_unformatted.inc/1.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_plugin_style_table.inc/1.7.4.12/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
+/views_plugin_access.inc/1.1.6.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_plugin_access_none.inc/1.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_plugin_access_perm.inc/1.3.6.3/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_plugin_access_role.inc/1.2.6.3/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_plugin_argument_default.inc/1.2.4.2/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_plugin_argument_default_fixed.inc/1.1.4.2/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_plugin_argument_default_php.inc/1.1.6.4/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_plugin_argument_validate.inc/1.2.4.2/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_plugin_argument_validate_numeric.inc/1.1.6.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_plugin_argument_validate_php.inc/1.1.6.2/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_plugin_cache.inc/1.5.4.6/Wed Feb 9 20:52:02 2011//TDRUPAL-7--3
+/views_plugin_cache_none.inc/1.2.4.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_plugin_cache_time.inc/1.3.4.4/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_plugin_display.inc/1.27.4.58/Result of merge//TDRUPAL-7--3
+/views_plugin_display_attachment.inc/1.6.4.3/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_plugin_display_block.inc/1.5.4.3/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_plugin_display_default.inc/1.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_plugin_display_feed.inc/1.7.4.6/Wed Feb 9 20:52:02 2011//TDRUPAL-7--3
+/views_plugin_display_page.inc/1.8.4.15/Wed Feb 9 20:52:02 2011//TDRUPAL-7--3
+/views_plugin_exposed_form.inc/1.2.2.18/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_plugin_exposed_form_basic.inc/1.2.2.2/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_plugin_exposed_form_input_required.inc/1.2.2.8/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_plugin_localization.inc/1.1.4.2/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_plugin_localization_core.inc/1.1.4.3/Wed Feb 9 20:52:02 2011//TDRUPAL-7--3
+/views_plugin_localization_none.inc/1.1.4.2/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_plugin_pager.inc/1.1.4.7/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_plugin_pager_full.inc/1.1.4.14/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_plugin_pager_mini.inc/1.1.4.5/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_plugin_pager_none.inc/1.1.4.3/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_plugin_pager_some.inc/1.1.4.3/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_plugin_query.inc/1.1.4.14/Wed Feb 9 20:52:02 2011//TDRUPAL-7--3
+/views_plugin_query_default.inc/1.1.4.40/Wed Feb 9 20:52:02 2011//TDRUPAL-7--3
+/views_plugin_row.inc/1.4.4.4/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_plugin_row_fields.inc/1.2.4.4/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_plugin_style.inc/1.8.4.10/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_plugin_style_default.inc/1.2/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_plugin_style_grid.inc/1.1.6.2/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_plugin_style_jump_menu.inc/1.1.6.10/Wed Feb 9 20:52:02 2011//TDRUPAL-7--3
+/views_plugin_style_list.inc/1.1.6.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_plugin_style_rss.inc/1.2.6.7/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_plugin_style_summary.inc/1.1.6.6/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_plugin_style_summary_jump_menu.inc/1.1.6.7/Wed Feb 9 20:52:02 2011//TDRUPAL-7--3
+/views_plugin_style_summary_unformatted.inc/1.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_plugin_style_table.inc/1.7.4.13/Wed Feb 9 20:52:02 2011//TDRUPAL-7--3
D
<?php
-// $Id: views_plugin_cache.inc,v 1.5.4.5 2010/10/12 23:23:52 merlinofchaos Exp $
+// $Id: views_plugin_cache.inc,v 1.5.4.6 2011/02/04 23:19:07 merlinofchaos Exp $
/**
* The base plugin to handle caching.
if (!$cutoff || $cache->created > $cutoff) {
$this->view->result = $cache->data['result'];
$this->view->total_rows = $cache->data['total_rows'];
- $this->view->set_current_page = $cache->data['current_page'];
+ $this->view->set_current_page($cache->data['current_page']);
$this->view->execute_time = 0;
return TRUE;
}
<?php
-// $Id: views_plugin_display.inc,v 1.27.4.52 2011/01/20 20:09:03 merlinofchaos Exp $
+// $Id: views_plugin_display.inc,v 1.27.4.58 2011/02/06 14:29:02 dereine Exp $
/**
* @file
* Contains the base display plugin.
* @ingroup views_display_plugins
*/
class views_plugin_display extends views_plugin {
+ /**
+ * The top object of a view.
+ *
+ * @var view
+ */
+ var $view = NULL;
+
var $handlers = array();
function init(&$view, &$display, $options = NULL) {
$plugin->init($this->view, $this->display, $options);
}
else {
+ $display_id = $this->is_defaulted($option_name) ? $this->display->id : 'default';
+ $plugin->localization_keys = array($display_id, $type);
+
if (!isset($this->base_field)) {
$views_data = views_fetch_data($this->view->base_table);
$this->view->base_field = $views_data['table']['base']['field'];
$handler = views_get_handler($info['table'], $info['field'], $handler_type, $override);
if ($handler) {
+ // Special override for area types so they know where they come from.
+ if ($handler_type == 'area') {
+ $handler->handler_type = $type;
+ }
+
$handler->init($this->view, $info);
$this->handlers[$type][$id] = &$handler;
}
$form['markup'] = array(
'#prefix' => '<div class="form-item description">',
'#suffix' => '</div>',
- '#value' => t('You may also adjust the !settings for the currently selected style by clicking on the icon.', array('!settings' => $this->option_link(t('settings'), 'exposed_form_options'))),
+ '#markup' => t('You may also adjust the !settings for the currently selected style by clicking on the icon.', array('!settings' => $this->option_link(t('settings'), 'exposed_form_options'))),
);
}
break;
$form['markup'] = array(
'#prefix' => '<div class="form-item description">',
'#suffix' => '</div>',
- '#value' => t('You may also adjust the !settings for the currently selected pager by clicking on the icon.', array('!settings' => $this->option_link(t('settings'), 'pager_options'))),
+ '#markup' => t('You may also adjust the !settings for the currently selected pager by clicking on the icon.', array('!settings' => $this->option_link(t('settings'), 'pager_options'))),
);
}
function render_filters() { }
/**
+ * Not all display plugins will suppert pager rendering.
+ */
+ function render_pager() {
+ return TRUE;
+ }
+
+ /**
* Render the 'more' link
*/
function render_more_link() {
$theme = views_theme_functions('views_more', $this->view, $this->display);
$path = check_url(url($path, $url_options));
- return theme($theme, array('more_url' => $path, 'link_text' => $this->use_more_text()));
+ return theme($theme, array('more_url' => $path, 'link_text' => check_plain($this->use_more_text())));
}
}
}
*/
function pre_execute() {
$this->view->set_use_ajax($this->use_ajax());
- if ($this->use_more()) {
+ if ($this->use_more() && !$this->use_more_always()) {
$this->view->get_total_rows = TRUE;
}
$this->view->init_handlers();
<?php
-// $Id: views_plugin_display_feed.inc,v 1.7.4.5 2010/12/18 08:02:38 dereine Exp $
+// $Id: views_plugin_display_feed.inc,v 1.7.4.6 2011/02/05 16:45:32 dereine Exp $
/**
* @file
* Contains the feed display plugin.
$clone->set_display($this->display->id);
$clone->build_title();
$plugin->attach_to($display_id, $this->get_path(), $clone->get_title());
+
+ // Clean up
+ $clone->destroy();
+ unset($clone);
}
}
<?php
-// $Id: views_plugin_display_page.inc,v 1.8.4.14 2011/01/04 21:26:47 dereine Exp $
+// $Id: views_plugin_display_page.inc,v 1.8.4.15 2011/02/04 14:13:16 dereine Exp $
/**
* @file
* Contains the page display plugin.
'#value' => $tab_options['name'],
);
$form['tab_options']['markup'] = array(
- '#value' => t('Menu selection requires the activation of menu module.'),
+ '#markup' => t('Menu selection requires the activation of menu module.'),
);
}
$form['tab_options']['weight'] = array(
<?php
-// $Id: views_plugin_localization_core.inc,v 1.1.4.2 2010/12/01 20:05:06 dereine Exp $
+// $Id: views_plugin_localization_core.inc,v 1.1.4.3 2011/02/06 14:29:02 dereine Exp $
/**
* @file
* view name, display_id, and a property, e.g., 'header'.
*/
function translate_string($string, $keys = array()) {
- return t($string);
+ return t($string);
}
/**
$languages = language_list();
$cached_language = $language;
unset($languages['en']);
- $language = current($languages);
+ if (!empty($languages)) {
+ $language = current($languages);
+ }
}
t($string);
<?php
-// $Id: views_plugin_query.inc,v 1.1.4.13 2011/01/04 01:11:34 merlinofchaos Exp $
+// $Id: views_plugin_query.inc,v 1.1.4.14 2011/02/05 00:39:32 merlinofchaos Exp $
/**
* @file views_plugin_query.inc
* Defines the base query class, which is the underlying layer in a View.
/**
* Render the pager, if necessary.
*/
- function render_pager() {
+ function render_pager($exposed_input) {
if (!empty($this->pager) && $this->pager->use_pager()) {
- $exposed_input = isset($this->view->exposed_data_raw) ? $this->view->exposed_data_raw : NULL;
return $this->pager->render($exposed_input);
}
+
return '';
}
<?php
-// $Id: views_plugin_query_default.inc,v 1.1.4.39 2011/01/06 00:37:05 dereine Exp $
+// $Id: views_plugin_query_default.inc,v 1.1.4.40 2011/02/05 16:50:37 dereine Exp $
/**
* @file views_plugin_query_default.inc
* Defines the default query object which builds SQL to execute using the
var $get_count_optimized = NULL;
/**
+ * The current used pager plugin.
+ *
+ * @var views_plugin_pager
+ */
+ var $pager = NULL;
+
+ /**
* Constructor; Create the basic query object and fill with default values.
*/
function init($base_table = 'node', $base_field = 'nid', $options) {
<?php
-// $Id: views_plugin_style_jump_menu.inc,v 1.1.6.7 2010/12/14 00:47:26 merlinofchaos Exp $
+// $Id: views_plugin_style_jump_menu.inc,v 1.1.6.10 2011/02/05 01:08:29 merlinofchaos Exp $
/**
* @file
* Contains the table style plugin.
$handlers = $this->display->handler->get_handlers('field');
if (empty($handlers)) {
$form['error_markup'] = array(
- '#value' => t('You need at least one field before you can configure your jump menu settings'),
- '#prefix' => '<div class="error form-item description">',
+ '#markup' => t('You need at least one field before you can configure your jump menu settings'),
+ '#prefix' => '<div class="error messages">',
'#suffix' => '</div>',
);
return;
}
$form['markup'] = array(
- '#value' => t('To properly configure a jump menu, you must select one field that will represent the path to utilize. You should then set that field to exclude. All other displayed fields will be part of the menu. Please note that all HTML will be stripped from this output as select boxes cannot show HTML.'),
+ '#markup' => t('To properly configure a jump menu, you must select one field that will represent the path to utilize. You should then set that field to exclude. All other displayed fields will be part of the menu. Please note that all HTML will be stripped from this output as select boxes cannot show HTML.'),
'#prefix' => '<div class="form-item description">',
'#suffix' => '</div>',
);
* This is overridden so that we can render our grouping specially.
*/
function render() {
- $result = $this->view->result;
- // Group the rows according to the grouping field, if specified.
- $fields = $this->render_fields($result);
- $sets = array();
- if ($this->options['grouping']) {
- foreach ($result as $index => $row) {
- $grouping = '';
- // Group on the rendered version of the field, not the raw. That way,
- // we can control any special formatting of the grouping field through
- // the admin or theme layer or anywhere else we'd like.
- if (isset($this->view->field[$this->options['grouping']])) {
- $grouping = strip_tags($this->get_field($index, $this->options['grouping']));
- if ($this->view->field[$this->options['grouping']]->options['label']) {
- $grouping = $this->view->field[$this->options['grouping']]->options['label'] . ': ' . $grouping;
- }
- }
- $sets[$grouping][] = $row;
- }
- }
- else {
- // Create a single group with an empty grouping field.
- $sets[''] = $result;
- }
+ $sets = $this->render_grouping($this->view->result, $this->options['grouping']);
// Turn this all into an $options array for the jump menu.
$this->view->row_index = 0;
$paths = array();
foreach ($sets as $title => $records) {
- foreach ($records as $row) {
+ foreach ($records as $row_index => $row) {
+ $this->view->row_index = $row_index;
$path = strip_tags($this->get_field($this->view->row_index, $this->options['path']));
// Putting a '/' in front messes up url() so let's take that out
// so users don't shoot themselves in the foot.
<?php
-// $Id: views_plugin_style_summary_jump_menu.inc,v 1.1.6.6 2010/12/14 00:47:26 merlinofchaos Exp $
+// $Id: views_plugin_style_summary_jump_menu.inc,v 1.1.6.7 2011/02/04 23:44:02 merlinofchaos Exp $
/**
* @file
* Contains the default summary style plugin, which displays items in an HTML list.
}
function query() {
+ // Copy the offset option.
$pager = array(
'type' => 'none',
- 'options' => array(),
+ 'options' => $this->display->handler->options['pager']['options'],
);
$this->display->handler->set_option('pager', $pager);
}
<?php
-// $Id: views_plugin_style_table.inc,v 1.7.4.12 2010/12/10 08:19:15 dereine Exp $
+// $Id: views_plugin_style_table.inc,v 1.7.4.13 2011/02/04 13:51:01 dereine Exp $
/**
* @file
* Contains the table style plugin.
$handlers = $this->display->handler->get_handlers('field');
if (empty($handlers)) {
$form['error_markup'] = array(
- '#markup' => '<div class="error form-item description">' . t('You need at least one field before you can configure your table settings') . '</div>',
+ '#markup' => '<div class="error messages">' . t('You need at least one field before you can configure your table settings') . '</div>',
);
return;
}
D/templates////
D/test_plugins////
D/user////
-/views_access.test/1.1.4.6/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_analyze.test/1.1.2.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_argument_default.test/1.1.2.3/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_argument_validator.test/1.1.4.6/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_basic.test/1.1.4.4/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_cache.test/1.1.4.3/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_exposed_form.test/1.1.2.6/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_glossary.test/1.1.4.4/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_groupby.test/1.1.4.4/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handlers.test/1.1.4.5/Fri Jan 28 23:27:53 2011//TDRUPAL-7--3
-/views_module.test/1.1.2.3/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_pager.test/1.1.2.6/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_plugin_localization_test.inc/1.1.4.2/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_query.test/1.1.2.17/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_test.info/1.1.2.3/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_test.install/1.1.2.3/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_test.module/1.1.2.9/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_test.views_default.inc/1.1.2.5/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_translatable.test/1.1.4.2/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
+/views_access.test/1.1.4.6/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_analyze.test/1.1.2.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_argument_default.test/1.1.2.3/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_argument_validator.test/1.1.4.6/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_basic.test/1.1.4.4/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_cache.test/1.1.4.3/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_exposed_form.test/1.1.2.6/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_glossary.test/1.1.4.4/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_groupby.test/1.1.4.4/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handlers.test/1.1.4.5/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_module.test/1.1.2.3/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_pager.test/1.1.2.6/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_plugin_localization_test.inc/1.1.4.2/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_query.test/1.1.2.17/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_test.info/1.1.2.3/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_test.install/1.1.2.3/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_test.module/1.1.2.9/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_test.views_default.inc/1.1.2.5/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_translatable.test/1.1.4.2/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_view.test/1.1.4.2/Sat Feb 5 16:45:32 2011//TDRUPAL-7--3
-/views_handler_area_text.test/1.1.2.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_argument_null.test/1.1.2.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_field_boolean.test/1.1.2.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_field_counter.test/1.1.2.2/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_field_custom.test/1.1.2.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_field_date.test/1.1.2.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_field_file_size.test/1.1.2.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_field_math.test/1.1.2.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_field_url.test/1.1.2.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_field_xss.test/1.1.2.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_filter_date.test/1.1.4.3/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_filter_equality.test/1.1.2.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_filter_in_operator.test/1.1.2.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_filter_numeric.test/1.1.2.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_filter_string.test/1.1.2.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_sort.test/1.1.2.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_sort_date.test/1.1.2.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_handler_sort_random.test/1.1.2.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
+/views_handler_area_text.test/1.1.2.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_argument_null.test/1.1.2.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_field_boolean.test/1.1.2.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_field_counter.test/1.1.2.2/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_field_custom.test/1.1.2.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_field_date.test/1.1.2.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_field_file_size.test/1.1.2.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_field_math.test/1.1.2.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_field_url.test/1.1.2.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_field_xss.test/1.1.2.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_filter_date.test/1.1.4.3/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_filter_equality.test/1.1.2.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_filter_in_operator.test/1.1.2.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_filter_numeric.test/1.1.2.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_filter_string.test/1.1.2.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_sort.test/1.1.2.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_sort_date.test/1.1.2.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_handler_sort_random.test/1.1.2.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
D
-/views-view--frontpage.tpl.php/1.1.4.2/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
+/views-view--frontpage.tpl.php/1.1.4.2/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
D
-/views_test_plugin_access_test_dynamic.inc/1.1.4.2/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_test_plugin_access_test_static.inc/1.1.4.2/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
+/views_test_plugin_access_test_dynamic.inc/1.1.4.2/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_test_plugin_access_test_static.inc/1.1.4.2/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
D
-/views_user_argument_default.test/1.1.4.4/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_user_argument_validate.test/1.1.4.2/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
+/views_user_argument_default.test/1.1.4.4/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_user_argument_validate.test/1.1.4.2/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
D
--- /dev/null
+<?php
+// $Id: views_view.test,v 1.1.4.2 2011/02/05 16:45:32 dereine Exp $
+/**
+ * Test the view class.
+ */
+class viewsViewTest extends ViewsSqlTest {
+ public static function getInfo() {
+ return array(
+ 'name' => 'Test the view class',
+ 'description' => 'Tests some functionality of the view class',
+ 'group' => 'Views',
+ );
+ }
+
+ /**
+ * Test the deconstructor to be sure that every kind of heavy objects are removed.
+ */
+ function testDestroy() {
+ $view = $this->view_test_destroy();
+
+ $view->preview();
+ $view->destroy();
+
+ $this->assertViewDestroy($view);
+
+ // Manipulate the display variable to test a previous bug.
+ $view = $this->view_test_destroy();
+ $view->preview();
+
+ unset($view->display);
+ $view->destroy();
+ $this->assertViewDestroy();
+ }
+
+ function assertViewDestroy($view) {
+ $this->assertNull($view->display['default']->handler, 'Take sure all displays are destroyed.');
+ $this->assertNull($view->display['attachment_1']->handler, 'Take sure all displays are destroyed.');
+
+ $this->assertNull($view->filter, 'Take sure all handlers are destroyed');
+ $this->assertNull($view->field, 'Take sure all handlers are destroyed');
+ $this->assertNull($view->argument, 'Take sure all handlers are destroyed');
+ $this->assertNull($view->relationship, 'Take sure all handlers are destroyed');
+ $this->assertNull($view->sort, 'Take sure all handlers are destroyed');
+ $this->assertNull($view->area, 'Take sure all handlers are destroyed');
+
+ $keys = array('current_display', 'display_handler', 'field', 'argument', 'filter', 'sort', 'relationship', 'header', 'footer', 'empty', 'query', 'result', 'inited', 'style_plugin', 'plugin_name', 'exposed_data', 'exposed_input', 'many_to_one_tables');
+ foreach ($keys as $key) {
+ $this->assertNull($view->{$key}, $key);
+ }
+ $this->assertEqual($view->build, FALSE);
+ $this->assertEqual($view->executed, FALSE);
+ $this->assertEqual($view->build_info, array());
+ $this->assertEqual($view->attachment_before, '');
+ $this->assertEqual($view->attachment_after, '');
+ }
+
+ /**
+ * This view provides some filters, fields, arguments, relationships, sorts, areas and attachments.
+ */
+ function view_test_destroy() {
+ $view = new view;
+ $view->name = 'test_destroy';
+ $view->description = '';
+ $view->tag = '';
+ $view->base_table = 'node';
+ $view->human_name = '';
+ $view->api_version = '3.0-alpha1';
+ $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
+
+ /* Display: Defaults */
+ $handler = $view->new_display('default', 'Defaults', 'default');
+ $handler->display->display_options['access']['type'] = 'none';
+ $handler->display->display_options['cache']['type'] = 'none';
+ $handler->display->display_options['query']['type'] = 'views_query';
+ $handler->display->display_options['exposed_form']['type'] = 'basic';
+ $handler->display->display_options['pager']['type'] = 'full';
+ $handler->display->display_options['style_plugin'] = 'default';
+ $handler->display->display_options['row_plugin'] = 'fields';
+ /* Header: Global: Text area */
+ $handler->display->display_options['header']['area']['id'] = 'area';
+ $handler->display->display_options['header']['area']['table'] = 'views';
+ $handler->display->display_options['header']['area']['field'] = 'area';
+ $handler->display->display_options['header']['area']['empty'] = FALSE;
+ /* Header: Global: Text area */
+ $handler->display->display_options['header']['area_1']['id'] = 'area_1';
+ $handler->display->display_options['header']['area_1']['table'] = 'views';
+ $handler->display->display_options['header']['area_1']['field'] = 'area';
+ $handler->display->display_options['header']['area_1']['empty'] = FALSE;
+ /* Footer: Global: Text area */
+ $handler->display->display_options['footer']['area']['id'] = 'area';
+ $handler->display->display_options['footer']['area']['table'] = 'views';
+ $handler->display->display_options['footer']['area']['field'] = 'area';
+ $handler->display->display_options['footer']['area']['empty'] = FALSE;
+ /* Footer: Global: Text area */
+ $handler->display->display_options['footer']['area_1']['id'] = 'area_1';
+ $handler->display->display_options['footer']['area_1']['table'] = 'views';
+ $handler->display->display_options['footer']['area_1']['field'] = 'area';
+ $handler->display->display_options['footer']['area_1']['empty'] = FALSE;
+ /* Empty text: Global: Text area */
+ $handler->display->display_options['empty']['area']['id'] = 'area';
+ $handler->display->display_options['empty']['area']['table'] = 'views';
+ $handler->display->display_options['empty']['area']['field'] = 'area';
+ $handler->display->display_options['empty']['area']['empty'] = FALSE;
+ /* Empty text: Global: Text area */
+ $handler->display->display_options['empty']['area_1']['id'] = 'area_1';
+ $handler->display->display_options['empty']['area_1']['table'] = 'views';
+ $handler->display->display_options['empty']['area_1']['field'] = 'area';
+ $handler->display->display_options['empty']['area_1']['empty'] = FALSE;
+ /* Relationship: Comment: Node */
+ $handler->display->display_options['relationships']['nid']['id'] = 'nid';
+ $handler->display->display_options['relationships']['nid']['table'] = 'comments';
+ $handler->display->display_options['relationships']['nid']['field'] = 'nid';
+ /* Relationship: Comment: Parent comment */
+ $handler->display->display_options['relationships']['pid']['id'] = 'pid';
+ $handler->display->display_options['relationships']['pid']['table'] = 'comments';
+ $handler->display->display_options['relationships']['pid']['field'] = 'pid';
+ /* Relationship: Comment: User */
+ $handler->display->display_options['relationships']['uid']['id'] = 'uid';
+ $handler->display->display_options['relationships']['uid']['table'] = 'comments';
+ $handler->display->display_options['relationships']['uid']['field'] = 'uid';
+ /* Field: Node: Nid */
+ $handler->display->display_options['fields']['nid']['id'] = 'nid';
+ $handler->display->display_options['fields']['nid']['table'] = 'node';
+ $handler->display->display_options['fields']['nid']['field'] = 'nid';
+ /* Field: Node: Path */
+ $handler->display->display_options['fields']['path']['id'] = 'path';
+ $handler->display->display_options['fields']['path']['table'] = 'node';
+ $handler->display->display_options['fields']['path']['field'] = 'path';
+ /* Field: Node: Post date */
+ $handler->display->display_options['fields']['created']['id'] = 'created';
+ $handler->display->display_options['fields']['created']['table'] = 'node';
+ $handler->display->display_options['fields']['created']['field'] = 'created';
+ /* Sort criterion: Node: In moderation */
+ $handler->display->display_options['sorts']['moderate']['id'] = 'moderate';
+ $handler->display->display_options['sorts']['moderate']['table'] = 'node';
+ $handler->display->display_options['sorts']['moderate']['field'] = 'moderate';
+ /* Sort criterion: Node: Last comment author */
+ $handler->display->display_options['sorts']['last_comment_name']['id'] = 'last_comment_name';
+ $handler->display->display_options['sorts']['last_comment_name']['table'] = 'node_comment_statistics';
+ $handler->display->display_options['sorts']['last_comment_name']['field'] = 'last_comment_name';
+ /* Sort criterion: Node: Last comment time */
+ $handler->display->display_options['sorts']['last_comment_timestamp']['id'] = 'last_comment_timestamp';
+ $handler->display->display_options['sorts']['last_comment_timestamp']['table'] = 'node_comment_statistics';
+ $handler->display->display_options['sorts']['last_comment_timestamp']['field'] = 'last_comment_timestamp';
+ /* Argument: Node: Created date */
+ $handler->display->display_options['arguments']['created_fulldate']['id'] = 'created_fulldate';
+ $handler->display->display_options['arguments']['created_fulldate']['table'] = 'node';
+ $handler->display->display_options['arguments']['created_fulldate']['field'] = 'created_fulldate';
+ $handler->display->display_options['arguments']['created_fulldate']['style_plugin'] = 'default_summary';
+ $handler->display->display_options['arguments']['created_fulldate']['default_argument_type'] = 'fixed';
+ /* Argument: Node: Created day */
+ $handler->display->display_options['arguments']['created_day']['id'] = 'created_day';
+ $handler->display->display_options['arguments']['created_day']['table'] = 'node';
+ $handler->display->display_options['arguments']['created_day']['field'] = 'created_day';
+ $handler->display->display_options['arguments']['created_day']['style_plugin'] = 'default_summary';
+ $handler->display->display_options['arguments']['created_day']['default_argument_type'] = 'fixed';
+ /* Argument: Node: Created month */
+ $handler->display->display_options['arguments']['created_month']['id'] = 'created_month';
+ $handler->display->display_options['arguments']['created_month']['table'] = 'node';
+ $handler->display->display_options['arguments']['created_month']['field'] = 'created_month';
+ $handler->display->display_options['arguments']['created_month']['style_plugin'] = 'default_summary';
+ $handler->display->display_options['arguments']['created_month']['default_argument_type'] = 'fixed';
+ /* Filter: Node: Nid */
+ $handler->display->display_options['filters']['nid']['id'] = 'nid';
+ $handler->display->display_options['filters']['nid']['table'] = 'node';
+ $handler->display->display_options['filters']['nid']['field'] = 'nid';
+ /* Filter: Node: Published */
+ $handler->display->display_options['filters']['status']['id'] = 'status';
+ $handler->display->display_options['filters']['status']['table'] = 'node';
+ $handler->display->display_options['filters']['status']['field'] = 'status';
+ /* Filter: Node: Title */
+ $handler->display->display_options['filters']['title']['id'] = 'title';
+ $handler->display->display_options['filters']['title']['table'] = 'node';
+ $handler->display->display_options['filters']['title']['field'] = 'title';
+
+ /* Display: Page */
+ $handler = $view->new_display('page', 'Page', 'page_1');
+ $handler->display->display_options['path'] = 'test_destroy';
+
+ /* Display: Attachment */
+ $handler = $view->new_display('attachment', 'Attachment', 'attachment_1');
+ $handler->display->display_options['pager']['type'] = 'some';
+ $handler->display->display_options['displays'] = array(
+ 'default' => 'default',
+ 'page_1' => 'page_1',
+ );
+
+ /* Display: Attachment */
+ $handler = $view->new_display('attachment', 'Attachment', 'attachment_2');
+ $handler->display->display_options['pager']['type'] = 'some';
+ $handler->display->display_options['displays'] = array(
+ 'default' => 'default',
+ 'page_1' => 'page_1',
+ );
+ $translatables['test_destroy'] = array(
+ t('Defaults'),
+ t('more'),
+ t('Apply'),
+ t('Reset'),
+ t('Sort By'),
+ t('Asc'),
+ t('Desc'),
+ t('Items per page'),
+ t('- All -'),
+ t('Offset'),
+ t('Text area'),
+ t('Node'),
+ t('Parent comment'),
+ t('User'),
+ t('Nid'),
+ t('Path'),
+ t('Post date'),
+ t('All'),
+ t('Page'),
+ t('Attachment'),
+ );
+
+ return $view;
+ }
+}
\ No newline at end of file
-/theme.inc/1.84.4.45/Result of merge//TDRUPAL-7--3
-/views-exposed-form.tpl.php/1.4.6.6/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views-more.tpl.php/1.3.4.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views-ui-edit-item.tpl.php/1.9/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views-ui-edit-tab.tpl.php/1.11.6.4/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views-ui-edit-view.tpl.php/1.10.6.2/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views-ui-list-views.tpl.php/1.6.6.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views-view-field.tpl.php/1.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views-view-fields.tpl.php/1.6.6.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views-view-grid.tpl.php/1.3.6.4/Fri Jan 28 23:27:53 2011//TDRUPAL-7--3
-/views-view-list.tpl.php/1.3.6.3/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views-view-row-comment.tpl.php/1.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views-view-row-node.tpl.php/1.3.6.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views-view-row-rss.tpl.php/1.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views-view-rss.tpl.php/1.3/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views-view-summary-unformatted.tpl.php/1.2.6.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views-view-summary.tpl.php/1.6.6.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views-view-table.tpl.php/1.8.6.3/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views-view-unformatted.tpl.php/1.6.6.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views-view.tpl.php/1.13.4.4/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
+/theme.inc/1.84.4.46/Result of merge//TDRUPAL-7--3
+/views-exposed-form.tpl.php/1.4.6.6/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views-more.tpl.php/1.3.4.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views-ui-edit-item.tpl.php/1.9/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views-ui-edit-tab.tpl.php/1.11.6.4/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views-ui-edit-view.tpl.php/1.10.6.2/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views-ui-list-views.tpl.php/1.6.6.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views-view-field.tpl.php/1.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views-view-fields.tpl.php/1.6.6.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views-view-grid.tpl.php/1.3.6.4/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views-view-list.tpl.php/1.3.6.3/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views-view-row-comment.tpl.php/1.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views-view-row-node.tpl.php/1.3.6.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views-view-row-rss.tpl.php/1.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views-view-rss.tpl.php/1.3/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views-view-summary-unformatted.tpl.php/1.2.6.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views-view-summary.tpl.php/1.6.6.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views-view-table.tpl.php/1.8.6.3/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views-view-unformatted.tpl.php/1.6.6.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views-view.tpl.php/1.13.4.4/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
D
<?php
-// $Id: theme.inc,v 1.84.4.45 2011/01/20 20:07:03 merlinofchaos Exp $
+// $Id: theme.inc,v 1.84.4.46 2011/02/05 00:39:32 merlinofchaos Exp $
/**
* @file theme.inc
$vars['exposed'] = !empty($view->exposed_widgets) ? $view->exposed_widgets : '';
$vars['more'] = $view->display_handler->render_more_link();
$vars['feed_icon'] = !empty($view->feed_icon) ? $view->feed_icon : '';
- $vars['pager'] = $view->query->render_pager();
+
+ $vars['pager'] = '';
+
+ if ($view->display_handler->render_pager()) {
+ $exposed_input = isset($view->exposed_data_raw) ? $view->exposed_data_raw : NULL;
+ $vars['pager'] = $view->query->render_pager($exposed_input);
+ }
$vars['attachment_before'] = !empty($view->attachment_before) ? $view->attachment_before : '';
$vars['attachment_after'] = !empty($view->attachment_after) ? $view->attachment_after : '';
-/de.po/1.22.6.2/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/eo.po/1.1.6.4/Mon Jan 24 12:36:17 2011/-ko/TDRUPAL-7--3
-/fr.po/1.1.6.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/it.po/1.1.6.2/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/pl.po/1.2.4.2/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/uk.po/1.1.2.8/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views.pot/1.8.6.3/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
+/de.po/1.22.6.2/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/eo.po/1.1.6.4/Wed Feb 9 04:53:44 2011/-ko/TDRUPAL-7--3
+/fr.po/1.1.6.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/it.po/1.1.6.2/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/pl.po/1.2.4.2/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/uk.po/1.1.2.8/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views.pot/1.8.6.3/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
D
-; $Id: views.info,v 1.7.6.62 2011/01/22 22:49:09 dereine Exp $
+; $Id: views.info,v 1.7.6.63 2011/02/05 16:45:32 dereine Exp $
name = Views
description = Create customized lists and queries from your database.
package = Views
files[] = tests/user/views_user_argument_default.test
files[] = tests/user/views_user_argument_validate.test
files[] = tests/views_cache.test
+files[] = tests/views_view.test
files[] = tests/views_ui.test
<?php
-// $Id: views.module,v 1.341.4.53 2011/01/06 00:37:05 dereine Exp $
+// $Id: views.module,v 1.341.4.54 2011/02/06 14:29:01 dereine Exp $
/**
* @file
* Primarily Drupal hooks and global API functions to manipulate views.
* The existing cache of theme hooks to test against.
* @param $path
* The path to search.
- *
+ *
* @see drupal_find_theme_templates
*/
function _views_find_module_templates($cache, $path) {
$data[$field][$key]['override handler'] = $override;
}
- $handler = _views_prepare_handler($data[$field][$key], $data, $field);
+ $handler = _views_prepare_handler($data[$field][$key], $data, $field, $key);
}
if ($handler) {
'table' => $table,
'field' => $field,
);
- return _views_create_handler($broken);
+ return _views_create_handler($broken, 'handler', $type);
}
/**
$exclude = array('q', 'submit', 'form_build_id', 'form_id', 'form_token', 'exposed_form_plugin', '');
$exposed_form_plugin = $form_state['exposed_form_plugin'];
$exposed_form_plugin->exposed_form_submit($form, $form_state, $exclude);
-
+
foreach ($form_state['values'] as $key => $value) {
if (!in_array($key, $exclude)) {
$form_state['view']->exposed_raw_input[$key] = $value;
-/views_export.css/1.1/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_export.info/1.1.6.2/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
-/views_export.module/1.9.4.5/Mon Jan 24 12:36:17 2011//TDRUPAL-7--3
+/views_export.css/1.1/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_export.info/1.1.6.2/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
+/views_export.module/1.9.4.5/Wed Feb 9 04:53:44 2011//TDRUPAL-7--3
D
projects / project/views.git / commitdiff