summaryrefslogtreecommitdiff
path: root/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/views.views.inc
diff options
context:
space:
mode:
Diffstat (limited to 'kolab.org/www/drupal-7.15/sites/all/modules/views/modules/views.views.inc')
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/views.views.inc29
1 files changed, 19 insertions, 10 deletions
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/views.views.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/views.views.inc
index 6aa8a09..2029aa8 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/views.views.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/views.views.inc
@@ -1,17 +1,14 @@
<?php
+
/**
* @file
* Provide views data and handlers that aren't tied to any other module.
- */
-
-/**
- * @defgroup views_views_module miscellaneous handlers
*
- * @{
+ * @ingroup views_module_handlers
*/
/**
- * Implements hook_views_data()
+ * Implements hook_views_data().
*/
function views_views_data() {
$data['views']['table']['group'] = t('Global');
@@ -60,6 +57,14 @@ function views_views_data() {
),
);
+ $data['views']['area_text_custom'] = array(
+ 'title' => t('Unfiltered text'),
+ 'help' => t('Add unrestricted, custom text or markup. This is similar to the custom text field.'),
+ 'area' => array(
+ 'handler' => 'views_handler_area_text_custom',
+ ),
+ );
+
$data['views']['view'] = array(
'title' => t('View area'),
'help' => t('Insert a view inside an area.'),
@@ -86,6 +91,14 @@ function views_views_data() {
);
}
+ $data['views']['combine'] = array(
+ 'title' => t('Combine fields filter'),
+ 'help' => t('Combine two fields together and search by them.'),
+ 'filter' => array(
+ 'handler' => 'views_handler_filter_combine',
+ ),
+ );
+
if (module_invoke('ctools', 'api_version', '1.7.1')) {
$data['views']['expression'] = array(
'title' => t('Math expression'),
@@ -99,7 +112,3 @@ function views_views_data() {
return $data;
}
-
-/**
- * @}
- */