',
- '#value' => t('The handler for this item is broken or missing and cannot be used. If a module provided the handler and was disabled, re-enabling the module may restore it. Otherwise, you should probably delete this item.'),
+ '#markup' => '
' . t('The handler for this item is broken or missing and cannot be used. If a module provided the handler and was disabled, re-enabling the module may restore it. Otherwise, you should probably delete this item.') . '
',
);
}
Index: handlers/views_handler_sort.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/handlers/views_handler_sort.inc,v
retrieving revision 1.1
diff -u -p -r1.1 views_handler_sort.inc
--- handlers/views_handler_sort.inc 3 Sep 2008 19:21:28 -0000 1.1
+++ handlers/views_handler_sort.inc 23 May 2009 14:32:04 -0000
@@ -70,8 +70,7 @@ class views_handler_sort_broken extends
function query() { /* No query to run */ }
function options_form(&$form, &$form_state) {
$form['markup'] = array(
- '#prefix' => '
',
- '#value' => t('The handler for this item is broken or missing and cannot be used. If a module provided the handler and was disabled, re-enabling the module may restore it. Otherwise, you should probably delete this item.'),
+ '#markup' => '
' . t('The handler for this item is broken or missing and cannot be used. If a module provided the handler and was disabled, re-enabling the module may restore it. Otherwise, you should probably delete this item.') . '
',
);
}
Index: help/api.html
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/help/api.html,v
retrieving revision 1.5
diff -u -p -r1.5 api.html
--- help/api.html 31 Jan 2009 18:16:26 -0000 1.5
+++ help/api.html 23 May 2009 14:32:04 -0000
@@ -14,7 +14,7 @@ There are two similar files, MODULENAME.
api
This must appear; it should be the oldest API version that your module can work with. If Views is currently running an older version of the API, it will ignore your module's views integration. This is a good thing, as it will prevent code crashes, at the expense of your module's functionality disappearing.
-You may find the current Views API version by calling views_api_version() which is implemented at the top of views.module. This version numbering starts at 2.0. Every time changes are made to the Views handlers and plugins or other aspects of the Views API, the number will tick up (by either .001, .01 .1 or 1 depending upon how major the changes are). Note that views_api_version() was introduced in Views 2.0-rc2 and may not exist prior to that version. You may use function_exists() to test to see if this function is there.
+You may find the current Views API version by calling views_api_version() which is implemented at the top of views.module. This version numbering starts at 2.0. Every time changes are made to the Views handlers and plugins or other aspects of the Views API, the number will tick up (by either .001, .01 .1 or 1 depending upon how major the changes are). Note that views_api_version() was introduced in Views 2.0-rc2 and may not exist prior to that version. You may use drupal_function_exists() to test to see if this function is there.
Often these versions are basically compatible with each other and Views won't care if your module implements 2.000, 2.001, 2.002, etc. Your module can request that it won't work with any version older than a given version, however. Views will determine, itself, if a newer version will work.
Index: includes/admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/includes/admin.inc,v
retrieving revision 1.155
diff -u -p -r1.155 admin.inc
--- includes/admin.inc 20 May 2009 02:53:29 -0000 1.155
+++ includes/admin.inc 23 May 2009 14:32:06 -0000
@@ -2866,7 +2866,7 @@ function views_fetch_fields($base, $type
static $fields = array();
if (empty($fields)) {
$data = views_fetch_data();
- $start = views_microtime();
+ $start = microtime(TRUE);
// This constructs this ginormous multi dimensional array to
// collect the important data about fields. In the end,
// the structure looks a bit like this (using nid as an example)
@@ -2936,7 +2936,7 @@ function views_fetch_fields($base, $type
}
}
}
-// vsm('Views UI data build time: ' . (views_microtime() - $start) * 1000 . ' ms');
+// vsm('Views UI data build time: ' . (microtime(TRUE) - $start) * 1000 . ' ms');
}
// If we have an array of base tables available, go through them
Index: includes/cache.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/includes/cache.inc,v
retrieving revision 1.24
diff -u -p -r1.24 cache.inc
--- includes/cache.inc 17 Feb 2009 23:31:05 -0000 1.24
+++ includes/cache.inc 23 May 2009 14:32:06 -0000
@@ -8,28 +8,13 @@
*/
/**
- * Load views files on behalf of modules.
- */
-function _views_include_handlers() {
- views_module_include('views.inc');
-}
-
-/**
- * Load default views files on behalf of modules.
- */
-function _views_include_default_views() {
- views_module_include('views_default.inc');
-}
-
-/**
* Fetch Views' data from the cache
*/
function _views_fetch_data($table = NULL) {
static $cache = NULL;
if (!isset($cache)) {
- $start = views_microtime();
+ $start = microtime(TRUE);
// NOTE: This happens whether we retrieve them from cache or otherwise.
- views_include_handlers();
$data = views_cache_get('views_data', TRUE);
if (!empty($data->data)) {
@@ -46,7 +31,7 @@ function _views_fetch_data($table = NULL
views_cache_set('views_data', $cache, TRUE);
}
- vpr('Views data build time: ' . (views_microtime() - $start) * 1000 . ' ms');
+ vpr('Views data build time: ' . (microtime(TRUE) - $start) * 1000 . ' ms');
}
if (!$table) {
@@ -66,12 +51,11 @@ function _views_fetch_data($table = NULL
function _views_fetch_plugin_data($type = NULL, $plugin = NULL) {
static $cache = NULL;
if (!isset($cache)) {
- $start = views_microtime();
- views_include_handlers();
+ $start = microtime(TRUE);
$cache = views_discover_plugins();
- vpr('Views plugins build time: ' . (views_microtime() - $start) * 1000 . ' ms');
+ vpr('Views plugins build time: ' . (microtime(TRUE) - $start) * 1000 . ' ms');
}
if (!$type && !$plugin) {
@@ -106,7 +90,6 @@ function _views_discover_default_views()
$cache = $data->data;
}
else {
- views_include_default_views();
$defaults = module_invoke_all('views_default_views');
$cache = array();
Index: includes/convert.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/includes/convert.inc,v
retrieving revision 1.14
diff -u -p -r1.14 convert.inc
--- includes/convert.inc 7 Apr 2009 23:21:00 -0000 1.14
+++ includes/convert.inc 23 May 2009 14:32:06 -0000
@@ -122,9 +122,6 @@ function views_ui_delete1_confirm_submit
* Convert a Views 1 view to a Views 2 view.
*/
function views1_import($imported) {
- views_include_handlers();
- views_module_include('views_convert.inc');
-
$view = views_new_view();
$view->name = $imported->name;
@@ -467,8 +464,6 @@ function views1_delete($arg) {
return NULL;
}
-
-
$result = db_query("DELETE FROM {view_sort} WHERE vid = $view->vid");
$result = db_query("DELETE FROM {view_argument} WHERE vid = $view->vid");
$result = db_query("DELETE FROM {view_tablefield} WHERE vid = $view->vid");
Index: includes/handlers.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/includes/handlers.inc,v
retrieving revision 1.109
diff -u -p -r1.109 handlers.inc
--- includes/handlers.inc 10 Apr 2009 20:22:54 -0000 1.109
+++ includes/handlers.inc 23 May 2009 14:32:06 -0000
@@ -14,7 +14,8 @@ function _views_create_handler($definiti
return;
}
- if (!class_exists($definition['handler']) && !views_include_handler($definition, $type)) {
+ // class_exists will automatically load the code file.
+ if (!class_exists($definition['handler'])) {
return;
}
@@ -27,61 +28,6 @@ function _views_create_handler($definiti
}
/**
- * Attempt to find the include file for a given handler from its definition.
- *
- * This will also attempt to include all parents, though we're maxing the
- * parent chain to 10 to prevent infinite loops.
- */
-function views_include_handler($definition, $type, $count = 0) {
- // Do not proceed if the class already exists.
- if (isset($definition['handler']) && class_exists($definition['handler'])) {
- return TRUE;
- }
-
- // simple infinite loop prevention.
- if ($count > 10) {
- vpr(t('Handler @handler include tried to loop infinitely!', array('@handler' => $definition['handler'])));
- return FALSE;
- }
-
- if (!isset($definition['path'])) {
- if ($type == 'handler') {
- $definition += views_fetch_handler_data($definition['handler']);
- }
- else {
- $definition += views_fetch_plugin_data($type, $definition['handler']);
- }
- }
-
- if (!empty($definition['parent'])) {
- if ($type == 'handler') {
- $parent = views_fetch_handler_data($definition['parent']);
- }
- else {
- $parent = views_fetch_plugin_data($type, $definition['parent']);
- }
-
- if ($parent) {
- $rc = views_include_handler($parent, $type, $count + 1);
- // If the parent chain cannot be included, don't try; this will
- // help alleviate problems with modules with cross dependencies.
- if (!$rc) {
- return FALSE;
- }
- }
- }
-
- if (isset($definition['path']) && $definition['file']) {
- $filename = './' . $definition['path'] . '/' . $definition['file'];
- if (file_exists($filename)) {
- require_once $filename;
- }
- }
-
- return class_exists($definition['handler']);
-}
-
-/**
* Prepare a handler's data by checking defaults and such.
*/
function _views_prepare_handler($definition, $data, $field) {
@@ -107,11 +53,11 @@ function _views_prepare_handler($definit
function views_fetch_handler_data($handler = NULL) {
static $cache = NULL;
if (!isset($cache)) {
- $start = views_microtime();
+ $start = microtime(TRUE);
$cache = views_discover_handlers();
- vpr('Views handlers build time: ' . (views_microtime() - $start) * 1000 . ' ms');
+ vpr('Views handlers build time: ' . (microtime(TRUE) - $start) * 1000 . ' ms');
}
if (!$handler) {
@@ -468,7 +414,7 @@ class views_handler extends views_object
$join = views_get_table_join($this->table, $base_table);
if ($join) {
- return drupal_clone($join);
+ return clone $join;
}
}
@@ -568,7 +514,7 @@ class views_many_to_one_helper {
// Cycle through the joins. This isn't as error-safe as the normal
// ensure_path logic. Perhaps it should be.
- $r_join = drupal_clone($join);
+ $r_join = clone $join;
while ($r_join->left_table != $base_table) {
$r_join = views_get_table_join($r_join->left_table, $base_table);
}
@@ -1010,9 +956,7 @@ function views_views_handlers() {
),
'handlers' => array(
// argument handlers
- 'views_handler_argument' => array(
- 'parent' => 'views_handler',
- ),
+ 'views_handler_argument',
'views_handler_argument_numeric' => array(
'parent' => 'views_handler_argument',
),
Index: includes/plugins.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/includes/plugins.inc,v
retrieving revision 1.152
diff -u -p -r1.152 plugins.inc
--- includes/plugins.inc 7 Jan 2009 23:31:12 -0000 1.152
+++ includes/plugins.inc 23 May 2009 14:32:06 -0000
@@ -247,23 +247,12 @@ function views_discover_plugins() {
$cache = array('display' => array(), 'style' => array(), 'row' => array(), 'argument default' => array(), 'argument validator' => array(), 'access' => array());
// Get plugins from all mdoules.
foreach (module_implements('views_plugins') as $module) {
- $function = $module . '_views_plugins';
- $result = $function();
+ $result = module_invoke($module, 'views_plugins');
if (!is_array($result)) {
continue;
}
$module_dir = isset($result['module']) ? $result['module'] : $module;
- // Setup automatic path/file finding for theme registration
- if ($module_dir == 'views') {
- $theme_path = drupal_get_path('module', $module_dir) . '/theme';
- $theme_file = 'theme.inc';
- $path = drupal_get_path('module', $module_dir) . '/plugins';
- }
- else {
- $theme_path = $path = drupal_get_path('module', $module_dir);
- $theme_file = "$module.views.inc";
- }
foreach ($result as $type => $info) {
if ($type == 'module') {
@@ -271,18 +260,6 @@ function views_discover_plugins() {
}
foreach ($info as $plugin => $def) {
$def['module'] = $module_dir;
- if (!isset($def['theme path'])) {
- $def['theme path'] = $theme_path;
- }
- if (!isset($def['theme file'])) {
- $def['theme file'] = $theme_file;
- }
- if (!isset($def['path'])) {
- $def['path'] = $path;
- }
- if (!isset($def['file'])) {
- $def['file'] = $def['handler'] . '.inc';
- }
if (!isset($def['parent'])) {
$def['parent'] = 'parent';
}
Index: includes/query.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/includes/query.inc,v
retrieving revision 1.42
diff -u -p -r1.42 query.inc
--- includes/query.inc 24 Mar 2009 23:06:24 -0000 1.42
+++ includes/query.inc 23 May 2009 14:32:06 -0000
@@ -524,7 +524,7 @@ class views_query {
// be the prior relationship. Unless it's a direct link.
// Safety! Don't modify an original here.
- $join = drupal_clone($join);
+ $join = clone $join;
// Do we need to try to ensure a path?
if ($join->left_table != $this->relationships[$relationship]['table'] &&
Index: includes/view.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/includes/view.inc,v
retrieving revision 1.152
diff -u -p -r1.152 view.inc
--- includes/view.inc 20 May 2009 02:53:29 -0000 1.152
+++ includes/view.inc 23 May 2009 14:32:07 -0000
@@ -189,7 +189,7 @@ class view extends views_db_object {
// has already been set; if it has, but $this->current_display is not
// set, then something is dreadfully wrong.
if (!empty($this->display[$id]->handler)) {
- $this->display[$id] = drupal_clone($this->display[$id]);
+ $this->display[$id] = clone $this->display[$id];
unset($this->display[$id]->handler);
}
$this->display[$id]->handler = views_get_plugin('display', $this->display[$id]->display_plugin);
@@ -550,7 +550,7 @@ class view extends views_db_object {
// Attempt to load from cache.
// @todo Load a build_info from cache.
- $start = views_microtime();
+ $start = microtime(TRUE);
// If that fails, let's build!
$this->build_info = array(
'query' => '',
@@ -589,7 +589,7 @@ class view extends views_db_object {
// Arguments can, in fact, cause this whole thing to abort.
if (!$this->_build_arguments()) {
- $this->build_time = views_microtime() - $start;
+ $this->build_time = microtime(TRUE) - $start;
return $this->built;
}
@@ -633,7 +633,7 @@ class view extends views_db_object {
$this->build_info['count_query'] = $this->query->query(TRUE);
$this->build_info['query_args'] = $this->query->get_where_args();
$this->built = TRUE;
- $this->build_time = views_microtime() - $start;
+ $this->build_time = microtime(TRUE) - $start;
// Attach displays
$this->attach_displays();
@@ -706,7 +706,7 @@ class view extends views_db_object {
$external = TRUE;
}
- $start = views_microtime();
+ $start = microtime(TRUE);
if (!empty($this->pager['items_per_page'])) {
// We no longer use pager_query() here because pager_query() does not
// support an offset. This is fine as we don't actually need pager
@@ -753,7 +753,7 @@ class view extends views_db_object {
if (!empty($external)) {
db_set_active();
}
- $this->execute_time = views_microtime() - $start;
+ $this->execute_time = microtime(TRUE) - $start;
}
$this->executed = TRUE;
@@ -773,7 +773,7 @@ class view extends views_db_object {
return;
}
- $start = views_microtime();
+ $start = microtime(TRUE);
if (!empty($this->live_preview) && variable_get('views_show_additional_queries', FALSE)) {
$this->start_query_capture();
}
@@ -803,7 +803,7 @@ class view extends views_db_object {
if (!empty($this->live_preview) && variable_get('views_show_additional_queries', FALSE)) {
$this->end_query_capture();
}
- $this->render_time = views_microtime() - $start;
+ $this->render_time = microtime(TRUE) - $start;
return $output;
}
@@ -1452,7 +1452,7 @@ class view extends views_db_object {
// *were not cloned*. We must clone them ourselves.
$displays = array();
foreach ($clone->display as $id => $display) {
- $displays[$id] = drupal_clone($display);
+ $displays[$id] = clone $display;
if (isset($displays[$id]->handler)) {
unset($displays[$id]->handler);
}
Index: js/dependent.js
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/js/dependent.js,v
retrieving revision 1.7
diff -u -p -r1.7 dependent.js
--- js/dependent.js 7 Apr 2009 23:10:00 -0000 1.7
+++ js/dependent.js 23 May 2009 14:32:07 -0000
@@ -17,7 +17,7 @@
* - Checkboxes don't have their own id, so you need to add one in a div
* around the checkboxes via #prefix and #suffix. You actually need to add TWO
* divs because it's the parent that gets hidden. Also be sure to retain the
- * 'expand_checkboxes' in the #process array, because the views process will
+ * 'form_process_checkboxes' in the #process array, because the views process will
* override it.
*/
Index: modules/aggregator.views.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/aggregator.views.inc,v
retrieving revision 1.2
diff -u -p -r1.2 aggregator.views.inc
--- modules/aggregator.views.inc 7 Apr 2009 23:07:31 -0000 1.2
+++ modules/aggregator.views.inc 23 May 2009 14:32:07 -0000
@@ -293,13 +293,11 @@ function aggregator_views_handlers() {
*/
function aggregator_views_plugins() {
return array(
- 'module' => 'views', // This just tells our themes are elsewhere.
'row' => array(
'aggregator_rss' => array(
'title' => t('Aggregator item'),
'help' => t('Display the aggregator item using the data from the original source.'),
'handler' => 'views_plugin_row_aggregator_rss',
- 'path' => drupal_get_path('module', 'views') . '/modules/aggregator', // not necessary for most modules
'theme' => 'views_view_row_rss',
'base' => array('aggregator_item'), // only works with 'node' as base.
'uses options' => TRUE,
Index: modules/comment.views.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/comment.views.inc,v
retrieving revision 1.32
diff -u -p -r1.32 comment.views.inc
--- modules/comment.views.inc 8 Apr 2009 06:38:41 -0000 1.32
+++ modules/comment.views.inc 23 May 2009 14:32:07 -0000
@@ -154,7 +154,7 @@ function comment_views_data() {
),
'filter' => array(
'handler' => 'views_handler_filter_boolean_operator',
- 'label' => t('Moderated'),
+ 'label' => t('Published'),
'type' => 'yes-no',
),
'sort' => array(
@@ -394,13 +394,11 @@ function comment_views_data_alter(&$data
*/
function comment_views_plugins() {
return array(
- 'module' => 'views', // This just tells views our themes are in Views.
'row' => array(
'comment' => array(
'title' => t('Comment'),
'help' => t('Display the comment with standard comment view.'),
'handler' => 'views_plugin_row_comment_view',
- 'path' => drupal_get_path('module', 'views') . '/modules/comment', // not necessary for most modules
'theme' => 'views_view_row_comment',
'base' => array('comments'), // only works with 'comment' as base.
'uses options' => TRUE,
@@ -411,7 +409,6 @@ function comment_views_plugins() {
'title' => t('Comment'),
'help' => t('Display the comment as RSS.'),
'handler' => 'views_plugin_row_comment_rss',
- 'path' => drupal_get_path('module', 'views') . '/modules/comment', // not necessary for most modules
'theme' => 'views_view_row_rss',
'base' => array('comments'), // only works with 'comment' as base.
'type' => 'feed',
Index: modules/comment.views_default.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/comment.views_default.inc,v
retrieving revision 1.7
diff -u -p -r1.7 comment.views_default.inc
--- modules/comment.views_default.inc 27 Jan 2009 20:24:09 -0000 1.7
+++ modules/comment.views_default.inc 23 May 2009 14:32:07 -0000
@@ -281,7 +281,7 @@ function comment_views_default_views() {
'table' => 'comments',
'field' => 'status',
'operator' => '=',
- 'value' => 0,
+ 'value' => 1,
'group' => 0,
'exposed' => FALSE,
'expose' => array(
Index: modules/node.views.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/node.views.inc,v
retrieving revision 1.93
diff -u -p -r1.93 node.views.inc
--- modules/node.views.inc 8 Apr 2009 20:54:57 -0000 1.93
+++ modules/node.views.inc 23 May 2009 14:32:08 -0000
@@ -614,13 +614,11 @@ function node_views_handlers() {
*/
function node_views_plugins() {
return array(
- 'module' => 'views', // This just tells our themes are elsewhere.
'row' => array(
'node' => array(
'title' => t('Node'),
'help' => t('Display the node with standard node view.'),
'handler' => 'views_plugin_row_node_view',
- 'path' => drupal_get_path('module', 'views') . '/modules/node', // not necessary for most modules
'theme' => 'views_view_row_node',
'base' => array('node'), // only works with 'node' as base.
'uses options' => TRUE,
@@ -631,7 +629,6 @@ function node_views_plugins() {
'title' => t('Node'),
'help' => t('Display the node with standard node view.'),
'handler' => 'views_plugin_row_node_rss',
- 'path' => drupal_get_path('module', 'views') . '/modules/node', // not necessary for most modules
'theme' => 'views_view_row_rss',
'base' => array('node'), // only works with 'node' as base.
'uses options' => TRUE,
@@ -643,14 +640,12 @@ function node_views_plugins() {
'node' => array(
'title' => t('Node'),
'handler' => 'views_plugin_argument_validate_node',
- 'path' => drupal_get_path('module', 'views') . '/modules/node', // not necessary for most modules
),
),
'argument default' => array(
'node' => array(
'title' => t('Node ID from URL'),
'handler' => 'views_plugin_argument_default_node',
- 'path' => drupal_get_path('module', 'views') . '/modules/node', // not necessary for most modules
'parent' => 'fixed', // so that the parent class is included
),
),
Index: modules/search.views.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/search.views.inc,v
retrieving revision 1.17
diff -u -p -r1.17 search.views.inc
--- modules/search.views.inc 23 Feb 2009 23:30:38 -0000 1.17
+++ modules/search.views.inc 23 May 2009 14:32:08 -0000
@@ -161,13 +161,11 @@ function search_views_plugins() {
return;
// DISABLED. This currently doesn't work.
return array(
- 'module' => 'views', // This just tells our themes are elsewhere.
'row' => array(
'search' => array(
'title' => t('Search'),
'help' => t('Display the results with standard search view.'),
'handler' => 'views_plugin_row_search_view',
- 'path' => drupal_get_path('module', 'views') . '/modules/search', // not necessary for most modules
'theme' => 'views_view_row_search',
'base' => array('node'), // only works with 'node' as base.
'type' => 'normal',
Index: modules/taxonomy.views.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/taxonomy.views.inc,v
retrieving revision 1.50
diff -u -p -r1.50 taxonomy.views.inc
--- modules/taxonomy.views.inc 8 Jan 2009 00:36:02 -0000 1.50
+++ modules/taxonomy.views.inc 23 May 2009 14:32:08 -0000
@@ -370,12 +370,10 @@ function taxonomy_views_handlers() {
*/
function taxonomy_views_plugins() {
return array(
- 'module' => 'views', // This just tells our themes are elsewhere.
'argument validator' => array(
'taxonomy_term' => array(
'title' => t('Taxonomy term'),
'handler' => 'views_plugin_argument_validate_taxonomy_term',
- 'path' => drupal_get_path('module', 'views') . '/modules/taxonomy',
),
),
);
Index: modules/user.views.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/user.views.inc,v
retrieving revision 1.56
diff -u -p -r1.56 user.views.inc
--- modules/user.views.inc 6 Feb 2009 20:54:53 -0000 1.56
+++ modules/user.views.inc 23 May 2009 14:32:09 -0000
@@ -297,18 +297,15 @@ function user_views_data() {
*/
function user_views_plugins() {
return array(
- 'module' => 'views', // This just tells our themes are elsewhere.
'argument default' => array(
'user' => array(
'title' => t('User ID from URL'),
'handler' => 'views_plugin_argument_default_user',
- 'path' => drupal_get_path('module', 'views') . '/modules/user', // not necessary for most modules
'parent' => 'fixed', // so that the parent class is included
),
'current_user' => array(
'title' => t('User ID from logged in user'),
'handler' => 'views_plugin_argument_default_current_user',
- 'path' => drupal_get_path('module', 'views') . '/modules/user', // not necessary for most modules
'parent' => 'fixed', // so that the parent class is included
),
),
@@ -316,7 +313,6 @@ function user_views_plugins() {
'user' => array(
'title' => t('User'),
'handler' => 'views_plugin_argument_validate_user',
- 'path' => drupal_get_path('module', 'views') . '/modules/user', // not necessary for most modules
),
),
);
Index: modules/node/views_handler_filter_history_user_timestamp.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/node/views_handler_filter_history_user_timestamp.inc,v
retrieving revision 1.1
diff -u -p -r1.1 views_handler_filter_history_user_timestamp.inc
--- modules/node/views_handler_filter_history_user_timestamp.inc 3 Sep 2008 19:21:29 -0000 1.1
+++ modules/node/views_handler_filter_history_user_timestamp.inc 23 May 2009 14:32:09 -0000
@@ -15,7 +15,7 @@ class views_handler_filter_history_user_
// Hey, Drupal kills old history, so nodes that haven't been updated
// since NODE_NEW_LIMIT are bzzzzzzzt outta here!
- $limit = time() - NODE_NEW_LIMIT;
+ $limit = REQUEST_TIME - NODE_NEW_LIMIT;
$this->ensure_my_table();
$field = "$this->table_alias.$this->real_field";
Index: modules/node/views_plugin_argument_validate_node.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/node/views_plugin_argument_validate_node.inc,v
retrieving revision 1.1
diff -u -p -r1.1 views_plugin_argument_validate_node.inc
--- modules/node/views_plugin_argument_validate_node.inc 3 Sep 2008 19:21:29 -0000 1.1
+++ modules/node/views_plugin_argument_validate_node.inc 23 May 2009 14:32:09 -0000
@@ -30,7 +30,7 @@ class views_plugin_argument_validate_nod
'#options' => $options,
'#default_value' => $arg,
'#description' => t('If you wish to validate for specific node types, check them; if none are checked, all nodes will pass.'),
- '#process' => array('expand_checkboxes', 'views_process_dependency'),
+ '#process' => array('form_process_checkboxes', 'views_process_dependency'),
'#dependency' => array('edit-options-validate-type' => array($this->id)),
);
Index: modules/taxonomy/views_handler_field_term_node_tid.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/taxonomy/views_handler_field_term_node_tid.inc,v
retrieving revision 1.3
diff -u -p -r1.3 views_handler_field_term_node_tid.inc
--- modules/taxonomy/views_handler_field_term_node_tid.inc 7 Apr 2009 22:02:40 -0000 1.3
+++ modules/taxonomy/views_handler_field_term_node_tid.inc 23 May 2009 14:32:09 -0000
@@ -55,7 +55,7 @@ class views_handler_field_term_node_tid
'#title' => t('Vocabularies'),
'#options' => $options,
'#default_value' => $this->options['vids'],
- '#process' => array('expand_checkboxes', 'views_process_dependency'),
+ '#process' => array('form_process_checkboxes', 'views_process_dependency'),
'#dependency' => array('edit-options-limit' => array(TRUE)),
);
}
Index: modules/taxonomy/views_handler_filter_term_node_tid.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/taxonomy/views_handler_filter_term_node_tid.inc,v
retrieving revision 1.8
diff -u -p -r1.8 views_handler_filter_term_node_tid.inc
--- modules/taxonomy/views_handler_filter_term_node_tid.inc 7 Apr 2009 23:21:01 -0000 1.8
+++ modules/taxonomy/views_handler_filter_term_node_tid.inc 23 May 2009 14:32:09 -0000
@@ -44,7 +44,7 @@ class views_handler_filter_term_node_tid
}
$form['markup_start'] = array(
- '#value' => '
',
+ '#markup' => '
',
);
$form['type'] = array(
@@ -63,7 +63,7 @@ class views_handler_filter_term_node_tid
);
$form['markup_end'] = array(
- '#value' => '
',
+ '#markup' => '
',
);
}
@@ -71,9 +71,7 @@ class views_handler_filter_term_node_tid
$vocabulary = taxonomy_vocabulary_load($this->options['vid']);
if (empty($vocabulary) && $this->options['limit']) {
$form['markup'] = array(
- '#prefix' => '
',
- '#suffix' => '
',
- '#value' => t('An invalid vocabulary is selected. Please change it in the options.'),
+ '#markup' => '
' . t('An invalid vocabulary is selected. Please change it in the options.') . '
',
);
return;
}
Index: modules/taxonomy/views_plugin_argument_validate_taxonomy_term.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/taxonomy/views_plugin_argument_validate_taxonomy_term.inc,v
retrieving revision 1.4
diff -u -p -r1.4 views_plugin_argument_validate_taxonomy_term.inc
--- modules/taxonomy/views_plugin_argument_validate_taxonomy_term.inc 8 Apr 2009 05:10:07 -0000 1.4
+++ modules/taxonomy/views_plugin_argument_validate_taxonomy_term.inc 23 May 2009 14:32:09 -0000
@@ -24,7 +24,7 @@ class views_plugin_argument_validate_tax
'#options' => $options,
'#default_value' => isset($this->argument->options['validate_argument_vocabulary']) ? $this->argument->options['validate_argument_vocabulary'] : array(),
'#description' => t('If you wish to validate for specific vocabularies, check them; if none are checked, all terms will pass.'),
- '#process' => array('expand_checkboxes', 'views_process_dependency'),
+ '#process' => array('form_process_checkboxes', 'views_process_dependency'),
'#dependency' => array('edit-options-validate-type' => array($this->id)),
);
Index: modules/user/views_plugin_argument_validate_user.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/user/views_plugin_argument_validate_user.inc,v
retrieving revision 1.2
diff -u -p -r1.2 views_plugin_argument_validate_user.inc
--- modules/user/views_plugin_argument_validate_user.inc 17 Feb 2009 23:32:33 -0000 1.2
+++ modules/user/views_plugin_argument_validate_user.inc 23 May 2009 14:32:09 -0000
@@ -26,7 +26,7 @@ class views_plugin_argument_validate_use
'either' => t('Allow both numeric UIDs and string usernames'),
),
'#default_value' => $this->argument->options['validate_user_argument_type'],
- '#process' => array('expand_radios', 'views_process_dependency'),
+ '#process' => array('form_process_radios', 'views_process_dependency'),
'#dependency' => array('edit-options-validate-type' => array($this->id)),
'#prefix' => '
',
'#suffix' => '
',
@@ -48,7 +48,7 @@ class views_plugin_argument_validate_use
'#options' => user_roles(TRUE),
'#default_value' => $this->argument->options['validate_user_roles'],
'#description' => t('If no roles are selected, users from any role will be allowed.'),
- '#process' => array('expand_checkboxes', 'views_process_dependency'),
+ '#process' => array('form_process_checkboxes', 'views_process_dependency'),
'#dependency' => array(
'edit-options-validate-type' => array($this->id),
'edit-options-validate-user-restrict-roles' => array(1),
Index: plugins/views_plugin_display.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/plugins/views_plugin_display.inc,v
retrieving revision 1.21
diff -u -p -r1.21 views_plugin_display.inc
--- plugins/views_plugin_display.inc 20 May 2009 02:53:30 -0000 1.21
+++ plugins/views_plugin_display.inc 23 May 2009 14:32:10 -0000
@@ -794,9 +794,7 @@ class views_plugin_display extends views
case 'use_ajax':
$form['#title'] .= t('Use AJAX when available to load this view');
$form['description'] = array(
- '#prefix' => '
',
- '#suffix' => '
',
- '#value' => t('If set, this view will use an AJAX mechanism for paging, table sorting and exposed filters. This means the entire page will not refresh. It is not recommended that you use this if this view is the main content of the page as it will prevent deep linking to specific pages, but it is very useful for side content.'),
+ '#markup' => '
' . t('If set, this view will use an AJAX mechanism for paging, table sorting and exposed filters. This means the entire page will not refresh. It is not recommended that you use this if this view is the main content of the page as it will prevent deep linking to specific pages, but it is very useful for side content.') . '
',
);
$form['use_ajax'] = array(
'#type' => 'radios',
@@ -869,9 +867,7 @@ class views_plugin_display extends views
$access_plugin = views_fetch_plugin_data('access', $access['type']);
if (!empty($access_plugin['uses options'])) {
$form['markup'] = array(
- '#prefix' => '
',
- '#suffix' => '
',
- '#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'), 'access_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'), 'access_options'))) . '
',
);
}
@@ -949,9 +945,7 @@ class views_plugin_display extends views
$style_plugin = views_fetch_plugin_data('style', $this->get_option('style_plugin'));
if (!empty($style_plugin['uses options'])) {
$form['markup'] = array(
- '#prefix' => '
',
- '#suffix' => '
',
- '#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'), 'style_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'), 'style_options'))) . '
',
);
}
@@ -994,9 +988,7 @@ class views_plugin_display extends views
$row_plugin = views_fetch_plugin_data('row', $this->get_option('row_plugin'));
if (!empty($row_plugin['uses options'])) {
$form['markup'] = array(
- '#prefix' => '
',
- '#suffix' => '
',
- '#value' => t('You may also adjust the !settings for the currently selected row style by clicking on the icon.', array('!settings' => $this->option_link(t('settings'), 'row_options'))),
+ '#markup' => '
' . t('You may also adjust the !settings for the currently selected row style by clicking on the icon.', array('!settings' => $this->option_link(t('settings'), 'row_options'))) . '
',
);
}
@@ -1064,15 +1056,11 @@ class views_plugin_display extends views
}
$form['important'] = array(
- '#prefix' => '
',
- '#suffix' => '
',
- '#value' => '
' . t('This section lists all possible templates for the display plugin and for the style plugins, ordered roughly from the least specific to the most specific. The active template for each plugin -- which is the most specific template found on the system -- is highlighted in bold.') . '
',
+ '#markup' => '
',
);
$form['analysis'] = array(
- '#prefix' => '
',
- '#suffix' => '
',
- '#value' => theme('item_list', $funcs),
+ '#markup' => '
' . theme('item_list', $funcs) . '
',
);
$form['rescan_button'] = array(
@@ -1085,9 +1073,7 @@ class views_plugin_display extends views
'#submit' => array('views_ui_config_item_form_rescan'),
);
$form['rescan_button']['markup'] = array(
- '#prefix' => '
',
- '#suffix' => '
',
- '#value' => t("
Important! When adding, removing, or renaming template files, it is necessary to make Drupal aware of the changes by making it rescan the files on your system. By clicking this button you clear Drupal's theme registry and thereby trigger this rescanning process. The highlighted templates above will then reflect the new state of your system."),
+ '#markup' => '
' . t("Important! When adding, removing, or renaming template files, it is necessary to make Drupal aware of the changes by making it rescan the files on your system. By clicking this button you clear Drupal's theme registry and thereby trigger this rescanning process. The highlighted templates above will then reflect the new state of your system.") . '
',
);
$form_state['ok_button'] = TRUE;
@@ -1112,9 +1098,7 @@ class views_plugin_display extends views
}
$form['analysis'] = array(
- '#prefix' => '
',
- '#suffix' => '
',
- '#value' => $output,
+ '#markup' => '
' . $output . '
',
);
$form_state['ok_button'] = TRUE;
@@ -1141,9 +1125,7 @@ class views_plugin_display extends views
}
$form['analysis'] = array(
- '#prefix' => '
',
- '#suffix' => '
',
- '#value' => $output,
+ '#markup' => '
' . $output . '
',
);
$form_state['ok_button'] = TRUE;
@@ -1170,9 +1152,7 @@ class views_plugin_display extends views
}
$form['analysis'] = array(
- '#prefix' => '
',
- '#suffix' => '
',
- '#value' => $output,
+ '#markup' => '
' . $output . '
',
);
$form_state['ok_button'] = TRUE;
@@ -1188,9 +1168,7 @@ class views_plugin_display extends views
$output .= '
' . check_plain(file_get_contents(drupal_get_path('module', 'views') . '/theme/views-view-field.tpl.php')) . '';
$form['analysis'] = array(
- '#prefix' => '
',
- '#suffix' => '
',
- '#value' => $output,
+ '#markup' => '
' . $output . '
',
);
$form_state['ok_button'] = TRUE;
break;
@@ -1198,9 +1176,7 @@ class views_plugin_display extends views
case 'exposed_block':
$form['#title'] .= t('Put the exposed form in a block');
$form['description'] = array(
- '#prefix' => '
',
- '#suffix' => '
',
- '#value' => t('If set, any exposed widgets will not appear with this view. Instead, a block will be made available to the Drupal block administration system, and the exposed form will appear there. Note that this block must be enabled manually, Views will not enable it for you.'),
+ '#markup' => '
' . t('If set, any exposed widgets will not appear with this view. Instead, a block will be made available to the Drupal block administration system, and the exposed form will appear there. Note that this block must be enabled manually, Views will not enable it for you.') . '
',
);
$form['exposed_block'] = array(
'#type' => 'radios',
@@ -1400,9 +1376,7 @@ class views_plugin_display extends views
'#submit' => array('views_ui_edit_display_form_override'),
);
$form['override']['markup'] = array(
- '#prefix' => '
',
- '#value' => theme('advanced_help_topic', 'views', 'overrides') . t('Status: using default values.'),
- '#suffix' => '
',
+ '#markup' => '
' . theme('advanced_help_topic', 'views', 'overrides') . t('Status: using default values.') . '
',
);
$form_state['update_name'] = t('Update default display');
@@ -1414,9 +1388,7 @@ class views_plugin_display extends views
'#submit' => array('views_ui_edit_display_form_override'),
);
$form['override']['markup'] = array(
- '#prefix' => '
',
- '#value' => theme('advanced_help_topic', 'views', 'overrides') . t('Status: using overridden values.'),
- '#suffix' => '
',
+ '#markup' => '
' . theme('advanced_help_topic', 'views', 'overrides') . t('Status: using overridden values.') . '
',
);
$form_state['update_name'] = NULL;
Index: plugins/views_plugin_display_page.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/plugins/views_plugin_display_page.inc,v
retrieving revision 1.6
diff -u -p -r1.6 views_plugin_display_page.inc
--- plugins/views_plugin_display_page.inc 20 May 2009 02:53:30 -0000 1.6
+++ plugins/views_plugin_display_page.inc 23 May 2009 14:32:10 -0000
@@ -305,9 +305,7 @@ class views_plugin_display_page extends
);
$form['menu']['name-warning'] = array(
'#type' => 'markup',
- '#prefix' => '
',
- '#value' => t("Warning: Changing this item's menu will not work reliably in Drupal 6.4 or earlier. Please upgrade your copy of Drupal at !url.", array('!url' => l('drupal.org', 'http://drupal.org/project/Drupal+project'))),
- '#suffix' => '
',
+ '#markup' => '
' . t("Warning: Changing this item's menu will not work reliably in Drupal 6.4 or earlier. Please upgrade your copy of Drupal at !url.", array('!url' => l('drupal.org', 'http://drupal.org/project/Drupal+project'))) . '
',
'#process' => array('views_process_dependency'),
'#dependency' => array('radio:menu[type]' => array('normal')),
'#access' => version_compare(VERSION, '6.5', '<'),
@@ -331,7 +329,7 @@ class views_plugin_display_page extends
'#value' => $menu['name'],
);
$form['menu']['markup'] = array(
- '#value' => t('Menu selection requires the activation of menu module.'),
+ '#markup' => t('Menu selection requires the activation of menu module.'),
);
}
$form['menu']['weight'] = array(
@@ -352,9 +350,7 @@ class views_plugin_display_page extends
}
$form['tab_markup'] = array(
- '#prefix' => '
',
- '#suffix' => '
',
- '#value' => t('When providing a menu item as a tab, Drupal needs to know what the parent menu item of that tab will be. Sometimes the parent will already exist, but other times you will need to have one created. The path of a parent item will always be the same path with the last part left off. i.e, if the path to this view is
foo/bar/baz, the parent path would be
foo/bar.'),
+ '#markup' => '
' . t('When providing a menu item as a tab, Drupal needs to know what the parent menu item of that tab will be. Sometimes the parent will already exist, but other times you will need to have one created. The path of a parent item will always be the same path with the last part left off. i.e, if the path to this view is foo/bar/baz, the parent path would be foo/bar.') . '
',
);
$form['tab_options'] = array(
Index: plugins/views_plugin_style_table.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/plugins/views_plugin_style_table.inc,v
retrieving revision 1.5
diff -u -p -r1.5 views_plugin_style_table.inc
--- plugins/views_plugin_style_table.inc 15 Oct 2008 22:25:36 -0000 1.5
+++ plugins/views_plugin_style_table.inc 23 May 2009 14:32:10 -0000
@@ -123,9 +123,7 @@ class views_plugin_style_table extends v
$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 table settings'),
- '#prefix' => '
',
- '#suffix' => '
',
+ '#markup' => '
' . t('You need at least one field before you can configure your table settings') . '
',
);
return;
}
@@ -218,7 +216,7 @@ class views_plugin_style_table extends v
// markup for the field name
$form['info'][$field]['name'] = array(
- '#value' => $field_names[$field],
+ '#markup' => $field_names[$field],
);
}
@@ -232,9 +230,7 @@ class views_plugin_style_table extends v
);
$form['description_markup'] = array(
- '#prefix' => '
',
- '#suffix' => '
',
- '#value' => t('Place fields into columns; you may combine multiple fields into the same column. If you do, the separator in the column specified will be used to separate the fields. Check the sortable box to make that column click sortable, and check the default sort radio to determine which column will be sorted by default, if any. You may control column order and field labels in the fields section.'),
+ '#markup' => '
' . t('Place fields into columns; you may combine multiple fields into the same column. If you do, the separator in the column specified will be used to separate the fields. Check the sortable box to make that column click sortable, and check the default sort radio to determine which column will be sorted by default, if any. You may control column order and field labels in the fields section.') . '
',
);
}
}
Index: views_export/views_export.info
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/views_export/views_export.info,v
retrieving revision 1.1
diff -u -p -r1.1 views_export.info
--- views_export/views_export.info 12 Jun 2008 16:17:25 -0000 1.1
+++ views_export/views_export.info 23 May 2009 14:32:11 -0000
@@ -4,4 +4,5 @@ name = Views exporter
description = Allows exporting multiple views at once.
package = "Views"
dependencies[] = views
-core = 6.x
+core = 7.x
+files[] = views_export.module
Index: views_export/views_export.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/views_export/views_export.module,v
retrieving revision 1.4
diff -u -p -r1.4 views_export.module
--- views_export/views_export.module 8 Apr 2009 16:11:51 -0000 1.4
+++ views_export/views_export.module 23 May 2009 14:32:11 -0000
@@ -28,7 +28,9 @@ function views_export_menu() {
return $items;
}
-
+/**
+ * Implementation of hook_theme().
+ */
function views_export_theme() {
return array(
'views_export_export_form' => array(
@@ -41,7 +43,12 @@ function views_export_theme() {
* Implementation of hook_perm().
*/
function views_export_perm() {
- return array('use views exporter');
+ return array(
+ 'use views exporter' => array(
+ 'title' => t('Use Views exporter'),
+ 'description' => t('Use the Views exporter.'),
+ ),
+ );
}
/**