summaryrefslogtreecommitdiff
path: root/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node
diff options
context:
space:
mode:
authorTorsten Grote <grote@kolabsys.com>2012-08-27 12:47:35 (GMT)
committerTorsten Grote <grote@kolabsys.com>2012-08-27 12:47:35 (GMT)
commit7b5e4a2b04e4fb38485bc12965e07794388d0224 (patch)
tree42031777dcb7476a63e9d6080ab9b8eef8ebb6f0 /kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node
parentee39408867ae52c2321036a67c472e684c1e1108 (diff)
downloadkolab.org-www-7b5e4a2b04e4fb38485bc12965e07794388d0224.tar.gz
updated ctools, ldap and views modules
Diffstat (limited to 'kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node')
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_argument_dates_various.inc12
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_argument_node_language.inc6
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_argument_node_nid.inc1
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_argument_node_type.inc8
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_argument_node_uid_revision.inc6
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_argument_node_vid.inc3
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_history_user_timestamp.inc14
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node.inc3
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_link.inc6
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_link_delete.inc6
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_link_edit.inc6
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_path.inc2
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_revision.inc8
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_revision_link.inc66
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_revision_link_delete.inc28
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_revision_link_revert.inc26
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_type.inc8
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_filter_history_user_timestamp.inc11
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_filter_node_access.inc6
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_filter_node_status.inc8
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_filter_node_type.inc9
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_filter_node_uid_revision.inc3
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_plugin_argument_default_node.inc1
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_plugin_argument_validate_node.inc4
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_plugin_row_node_rss.inc14
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_plugin_row_node_view.inc17
26 files changed, 218 insertions, 64 deletions
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_argument_dates_various.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_argument_dates_various.inc
index 95404f1..5f4e4b2 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_argument_dates_various.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_argument_dates_various.inc
@@ -1,11 +1,13 @@
<?php
+
/**
- * @defgroup views_argument_handlers Handlers for arguments
- * @{
+ * @file
+ * Handlers for various date arguments.
+ *
+ * @ingroup views_argument_handlers
*/
/**
- * @file
* Argument handler for a full date (CCYYMMDD)
*/
class views_handler_argument_node_created_fulldate extends views_handler_argument_date {
@@ -173,7 +175,3 @@ class views_handler_argument_node_created_week extends views_handler_argument_da
return t('Week @week', array('@week' => $created));
}
}
-
-/**
- * @}
- */
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_argument_node_language.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_argument_node_language.inc
index 1978168..170388a 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_argument_node_language.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_argument_node_language.inc
@@ -1,4 +1,10 @@
<?php
+
+/**
+ * @file
+ * Definition of views_handler_argument_node_language.
+ */
+
/**
* Argument handler to accept a language.
*/
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_argument_node_nid.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_argument_node_nid.inc
index 991bc8d..b0dbee0 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_argument_node_nid.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_argument_node_nid.inc
@@ -1,4 +1,5 @@
<?php
+
/**
* @file
* Provide node nid argument handler.
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_argument_node_type.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_argument_node_type.inc
index 638973d..ea99d7c 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_argument_node_type.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_argument_node_type.inc
@@ -1,8 +1,14 @@
<?php
+
+/**
+ * @file
+ * Definition of views_handler_argument_node_type.
+ */
+
/**
* Argument handler to accept a node type.
*/
-class views_handler_argument_node_type extends views_handler_argument {
+class views_handler_argument_node_type extends views_handler_argument_string {
function construct() {
parent::construct('type');
}
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_argument_node_uid_revision.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_argument_node_uid_revision.inc
index 995872c..142882a 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_argument_node_uid_revision.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_argument_node_uid_revision.inc
@@ -1,5 +1,9 @@
<?php
-// $Id$
+
+/**
+ * @file
+ * Defintion of views_handler_argument_node_uid_revision.
+ */
/**
* Filter handler to accept a user id to check for nodes that
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_argument_node_vid.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_argument_node_vid.inc
index 55db56a..1f970ad 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_argument_node_vid.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_argument_node_vid.inc
@@ -1,4 +1,5 @@
<?php
+
/**
* @file
* Provide node vid argument handler.
@@ -16,7 +17,7 @@ class views_handler_argument_node_vid extends views_handler_argument_numeric {
function title_query() {
$titles = array();
- $result = db_query("SELECT n.title FROM {node_revision} n WHERE n.nid IN (:nids)", array(':nids' => $this->value));
+ $result = db_query("SELECT n.title FROM {node_revision} n WHERE n.vid IN (:vids)", array(':vids' => $this->value));
foreach ($result as $term) {
$titles[] = check_plain($term->title);
}
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_history_user_timestamp.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_history_user_timestamp.inc
index 45f6c56..dfe4931 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_history_user_timestamp.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_history_user_timestamp.inc
@@ -1,8 +1,15 @@
<?php
+
+/**
+ * @file
+ * Definition of views_handler_field_history_user_timestamp.
+ */
+
/**
* Field handler to display the marker for new content.
*
- * The handler is named history_user, because of compability reasons, the table is history.
+ * The handler is named history_user, because of compability reasons, the table
+ * is history.
*
* @ingroup views_field_handlers
*/
@@ -22,7 +29,7 @@ class views_handler_field_history_user_timestamp extends views_handler_field_nod
function option_definition() {
$options = parent::option_definition();
- $options['comments'] = array('default' => FALSE);
+ $options['comments'] = array('default' => FALSE, 'bool' => TRUE);
return $options;
}
@@ -56,12 +63,11 @@ class views_handler_field_history_user_timestamp extends views_handler_field_nod
global $user;
if ($user->uid) {
$last_read = $this->get_value($values);
- $created = $this->get_value($values, 'created');
$changed = $this->get_value($values, 'changed');
$last_comment = module_exists('comment') && !empty($this->options['comments']) ? $this->get_value($values, 'last_comment') : 0;
- if (!$last_read && $created > NODE_NEW_LIMIT) {
+ if (!$last_read && $changed > NODE_NEW_LIMIT) {
$mark = MARK_NEW;
}
elseif ($changed > $last_read && $changed > NODE_NEW_LIMIT) {
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node.inc
index eb90f01..f712a53 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node.inc
@@ -1,4 +1,5 @@
<?php
+
/**
* @file
* Contains the basic 'node' field handler.
@@ -26,7 +27,7 @@ class views_handler_field_node extends views_handler_field {
function option_definition() {
$options = parent::option_definition();
- $options['link_to_node'] = array('default' => isset($this->definition['link_to_node default']) ? $this->definition['link_to_node default'] : FALSE);
+ $options['link_to_node'] = array('default' => isset($this->definition['link_to_node default']) ? $this->definition['link_to_node default'] : FALSE, 'bool' => TRUE);
return $options;
}
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_link.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_link.inc
index ee9c2b9..7e9bbd2 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_link.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_link.inc
@@ -1,4 +1,10 @@
<?php
+
+/**
+ * @file
+ * Definition of views_handler_field_node_link.
+ */
+
/**
* Field handler to present a link to the node.
*
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_link_delete.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_link_delete.inc
index 3e8075c..8271c0b 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_link_delete.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_link_delete.inc
@@ -1,4 +1,10 @@
<?php
+
+/**
+ * @file
+ * Definition of views_handler_field_node_link_delete.
+ */
+
/**
* Field handler to present a link to delete a node.
*
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_link_edit.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_link_edit.inc
index f082c31..4e8aad0 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_link_edit.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_link_edit.inc
@@ -1,4 +1,10 @@
<?php
+
+/**
+ * @file
+ * Definition of views_handler_field_node_link_edit.
+ */
+
/**
* Field handler to present a link node edit.
*
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_path.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_path.inc
index 725869b..f47f85f 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_path.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_path.inc
@@ -14,7 +14,7 @@ class views_handler_field_node_path extends views_handler_field {
function option_definition() {
$options = parent::option_definition();
- $options['absolute'] = array('default' => FALSE);
+ $options['absolute'] = array('default' => FALSE, 'bool' => TRUE);
return $options;
}
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_revision.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_revision.inc
index 3195e64..c04693a 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_revision.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_revision.inc
@@ -1,4 +1,10 @@
<?php
+
+/**
+ * @file
+ * Definition of views_handler_field_node_revision.
+ */
+
/**
* Contains the basic 'node_revision' field handler.
*/
@@ -21,7 +27,7 @@ class views_handler_field_node_revision extends views_handler_field_node {
}
function option_definition() {
$options = parent::option_definition();
- $options['link_to_node_revision'] = array('default' => FALSE);
+ $options['link_to_node_revision'] = array('default' => FALSE, 'bool' => TRUE);
return $options;
}
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_revision_link.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_revision_link.inc
new file mode 100644
index 0000000..69047bb
--- /dev/null
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_revision_link.inc
@@ -0,0 +1,66 @@
+<?php
+
+/**
+ * @file
+ * Definition of views_handler_field_node_revision_link.
+ */
+
+/**
+ * Field handler to present a link to a node revision.
+ *
+ * @ingroup views_field_handlers
+ */
+class views_handler_field_node_revision_link extends views_handler_field_node_link {
+
+ function construct() {
+ parent::construct();
+ $this->additional_fields['node_vid'] = array('table' => 'node_revision', 'field' => 'vid');
+ }
+
+ function access() {
+ return user_access('view revisions') || user_access('administer nodes');
+ }
+
+ function render_link($data, $values) {
+ list($node, $vid) = $this->get_revision_entity($values, 'view');
+ if (!isset($vid)) {
+ return;
+ }
+
+ // Current revision uses the node view path.
+ $path = 'node/' . $node->nid;
+ if ($node->vid != $vid) {
+ $path .= "/revisions/$vid/view";
+ }
+
+ $this->options['alter']['make_link'] = TRUE;
+ $this->options['alter']['path'] = $path;
+ $this->options['alter']['query'] = drupal_get_destination();
+
+ return !empty($this->options['text']) ? $this->options['text'] : t('view');
+ }
+
+ /**
+ * Returns the revision values of a node.
+ *
+ * @param object $values
+ * An object containing all retrieved values.
+ * @param string $op
+ * The operation being performed.
+ *
+ * @return array
+ * A numerically indexed array containing the current node object and the
+ * revision ID for this row.
+ */
+ function get_revision_entity($values, $op) {
+ $vid = $this->get_value($values, 'node_vid');
+ $node = $this->get_value($values);
+ // Unpublished nodes ignore access control.
+ $node->status = 1;
+ // Ensure user has access to perform the operation on this node.
+ if (!node_access($op, $node)) {
+ return array($node, NULL);
+ }
+ return array($node, $vid);
+ }
+}
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_revision_link_delete.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_revision_link_delete.inc
index b005c2e..e0d00a7 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_revision_link_delete.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_revision_link_delete.inc
@@ -1,38 +1,36 @@
<?php
+
+/**
+ * @file
+ * Definition of views_handler_field_node_revision_link_delete.
+ */
+
/**
- * Field handler to present delete a node revision.
+ * Field handler to present link to delete a node revision.
*
* @ingroup views_field_handlers
*/
-class views_handler_field_node_revision_link_delete extends views_handler_field_node_link {
- function construct() {
- parent::construct();
- $this->additional_fields['node_vid'] = array('table' => 'node', 'field' => 'vid');
- }
+class views_handler_field_node_revision_link_delete extends views_handler_field_node_revision_link {
function access() {
return user_access('delete revisions') || user_access('administer nodes');
}
function render_link($data, $values) {
- // ensure user has access to delete this node.
- $node = $this->get_value($values);
- $node->status = 1; // unpublished nodes ignore access control
- if (!node_access('delete', $node)) {
+ list($node, $vid) = $this->get_revision_entity($values, 'delete');
+ if (!isset($vid)) {
return;
}
// Current revision cannot be deleted.
- if ($node->vid == $this->get_value($values, 'node_vid')) {
+ if ($node->vid == $vid) {
return;
}
- $text = !empty($this->options['text']) ? $this->options['text'] : t('delete');
-
$this->options['alter']['make_link'] = TRUE;
- $this->options['alter']['path'] = "node/$node->nid/revisions/$node->vid/delete";
+ $this->options['alter']['path'] = 'node/' . $node->nid . "/revisions/$vid/delete";
$this->options['alter']['query'] = drupal_get_destination();
- return $text;
+ return !empty($this->options['text']) ? $this->options['text'] : t('delete');
}
}
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_revision_link_revert.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_revision_link_revert.inc
index f26c0a3..af20442 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_revision_link_revert.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_revision_link_revert.inc
@@ -1,38 +1,36 @@
<?php
+
+/**
+ * @file
+ * Definition of views_handler_field_node_revision_link_revert.
+ */
+
/**
* Field handler to present a link to revert a node to a revision.
*
* @ingroup views_field_handlers
*/
-class views_handler_field_node_revision_link_revert extends views_handler_field_node_link {
- function construct() {
- parent::construct();
- $this->additional_fields['node_vid'] = array('table' => 'node', 'field' => 'vid');
- }
+class views_handler_field_node_revision_link_revert extends views_handler_field_node_revision_link {
function access() {
return user_access('revert revisions') || user_access('administer nodes');
}
function render_link($data, $values) {
- // ensure user has access to edit this node.
- $node = $this->get_value($values);
- $node->status = 1; // unpublished nodes ignore access control
- if (!node_access('update', $node)) {
+ list($node, $vid) = $this->get_revision_entity($values, 'update');
+ if (!isset($vid)) {
return;
}
// Current revision cannot be reverted.
- if ($node->vid == $this->get_value($values, 'node_vid')) {
+ if ($node->vid == $vid) {
return;
}
- $text = !empty($this->options['text']) ? $this->options['text'] : t('revert');
-
$this->options['alter']['make_link'] = TRUE;
- $this->options['alter']['path'] = "node/$node->nid/revisions/$node->vid/revert";
+ $this->options['alter']['path'] = 'node/' . $node->nid . "/revisions/$vid/revert";
$this->options['alter']['query'] = drupal_get_destination();
- return $text;
+ return !empty($this->options['text']) ? $this->options['text'] : t('revert');
}
}
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_type.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_type.inc
index 6d6202a..ba8ee3e 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_type.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_type.inc
@@ -1,6 +1,11 @@
<?php
/**
+ * @file
+ * Definition of views_handler_field_node_type.
+ */
+
+/**
* Field handler to translate a node type into its readable form.
*
* @ingroup views_field_handlers
@@ -8,7 +13,7 @@
class views_handler_field_node_type extends views_handler_field_node {
function option_definition() {
$options = parent::option_definition();
- $options['machine_name'] = array('default' => FALSE);
+ $options['machine_name'] = array('default' => FALSE, 'bool' => TRUE);
return $options;
}
@@ -24,7 +29,6 @@ class views_handler_field_node_type extends views_handler_field_node {
'#description' => t('Display field as the content type machine name.'),
'#type' => 'checkbox',
'#default_value' => !empty($this->options['machine_name']),
- '#fieldset' => 'more',
);
}
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_filter_history_user_timestamp.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_filter_history_user_timestamp.inc
index a13f531..acdb831 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_filter_history_user_timestamp.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_filter_history_user_timestamp.inc
@@ -1,8 +1,15 @@
<?php
+
+/**
+ * @file
+ * Definition of views_handler_filter_history_user_timestamp.
+ */
+
/**
- * Filter for new content
+ * Filter for new content.
*
- * The handler is named history_user, because of compability reasons, the table is history.
+ * The handler is named history_user, because of compability reasons, the table
+ * is history.
*
* @ingroup views_filter_handlers
*/
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_filter_node_access.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_filter_node_access.inc
index 37306f8..a9ee85c 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_filter_node_access.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_filter_node_access.inc
@@ -1,4 +1,10 @@
<?php
+
+/**
+ * @file
+ * Definition of views_handler_filter_node_access.
+ */
+
/**
* Filter by node_access records.
*
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_filter_node_status.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_filter_node_status.inc
index 0babe5b..2afb286 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_filter_node_status.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_filter_node_status.inc
@@ -1,6 +1,12 @@
<?php
+
+/**
+ * @file
+ * Definition of views_handler_filter_node_status.
+ */
+
/**
- * Filter by published status
+ * Filter by published status.
*
* @ingroup views_filter_handlers
*/
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_filter_node_type.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_filter_node_type.inc
index 8312691..7f8ab4b 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_filter_node_type.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_filter_node_type.inc
@@ -1,6 +1,12 @@
<?php
+
/**
- * Filter by node type
+ * @file
+ * Definition of views_handler_filter_node_type.
+ */
+
+/**
+ * Filter by node type.
*
* @ingroup views_filter_handlers
*/
@@ -9,6 +15,7 @@ class views_handler_filter_node_type extends views_handler_filter_in_operator {
if (!isset($this->value_options)) {
$this->value_title = t('Content types');
$types = node_type_get_types();
+ $options = array();
foreach ($types as $type => $info) {
$options[$type] = t($info->name);
}
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_filter_node_uid_revision.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_filter_node_uid_revision.inc
index 9c6055c..4d3d9a7 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_filter_node_uid_revision.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_filter_node_uid_revision.inc
@@ -1,7 +1,8 @@
<?php
+
/**
* @file
- * Contains handler views_handler_filter_node_uid_revision.
+ * Definition of views_handler_filter_node_uid_revision.
*/
/**
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_plugin_argument_default_node.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_plugin_argument_default_node.inc
index f88af08..65fc0eb 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_plugin_argument_default_node.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_plugin_argument_default_node.inc
@@ -1,4 +1,5 @@
<?php
+
/**
* @file
* Contains the node from URL argument default plugin.
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_plugin_argument_validate_node.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_plugin_argument_validate_node.inc
index 498ee76..018965d 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_plugin_argument_validate_node.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_plugin_argument_validate_node.inc
@@ -1,4 +1,5 @@
<?php
+
/**
* @file
* Contains the 'node' argument validator plugin.
@@ -11,7 +12,7 @@ class views_plugin_argument_validate_node extends views_plugin_argument_validate
function option_definition() {
$options = parent::option_definition();
$options['types'] = array('default' => array());
- $options['access'] = array('default' => FALSE);
+ $options['access'] = array('default' => FALSE, 'bool' => TRUE);
$options['access_op'] = array('default' => 'view');
$options['nid_type'] = array('default' => 'nid');
@@ -20,6 +21,7 @@ class views_plugin_argument_validate_node extends views_plugin_argument_validate
function options_form(&$form, &$form_state) {
$types = node_type_get_types();
+ $options = array();
foreach ($types as $type => $info) {
$options[$type] = check_plain(t($info->name));
}
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_plugin_row_node_rss.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_plugin_row_node_rss.inc
index 189ff1f..5da746b 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_plugin_row_node_rss.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_plugin_row_node_rss.inc
@@ -1,4 +1,5 @@
<?php
+
/**
* @file
* Contains the node RSS row style plugin.
@@ -20,7 +21,7 @@ class views_plugin_row_node_rss extends views_plugin_row {
$options = parent::option_definition();
$options['item_length'] = array('default' => 'default');
- $options['links'] = FALSE;
+ $options['links'] = array('default' => FALSE, 'bool' => TRUE);
return $options;
}
@@ -135,8 +136,15 @@ class views_plugin_row_node_rss extends views_plugin_row {
if (!empty($node->rss_namespaces)) {
$this->view->style_plugin->namespaces = array_merge($this->view->style_plugin->namespaces, $node->rss_namespaces);
- } else if (module_exists('rdf')) {
- $this->view->style_plugin->namespaces = array_merge($this->view->style_plugin->namespaces, rdf_get_namespaces());
+ }
+ elseif (function_exists('rdf_get_namespaces')) {
+ // Merge RDF namespaces in the XML namespaces in case they are used
+ // further in the RSS content.
+ $xml_rdf_namespaces = array();
+ foreach (rdf_get_namespaces() as $prefix => $uri) {
+ $xml_rdf_namespaces['xmlns:' . $prefix] = $uri;
+ }
+ $this->view->style_plugin->namespaces += $xml_rdf_namespaces;
}
// Hide the links if desired.
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_plugin_row_node_view.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_plugin_row_node_view.inc
index d745add..4aefe46 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_plugin_row_node_view.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_plugin_row_node_view.inc
@@ -1,4 +1,5 @@
<?php
+
/**
* @file
* Contains the node view row style plugin.
@@ -35,8 +36,8 @@ class views_plugin_row_node_view extends views_plugin_row {
$options = parent::option_definition();
$options['view_mode'] = array('default' => 'teaser');
- $options['links'] = array('default' => TRUE);
- $options['comments'] = array('default' => FALSE);
+ $options['links'] = array('default' => TRUE, 'bool' => TRUE);
+ $options['comments'] = array('default' => FALSE, 'bool' => TRUE);
return $options;
}
@@ -98,10 +99,12 @@ class views_plugin_row_node_view extends views_plugin_row {
}
function render($row) {
- $node = $this->nodes[$row->{$this->field_alias}];
- $node->view = $this->view;
- $build = node_view($node, $this->options['view_mode']);
+ if (isset($this->nodes[$row->{$this->field_alias}])) {
+ $node = $this->nodes[$row->{$this->field_alias}];
+ $node->view = $this->view;
+ $build = node_view($node, $this->options['view_mode']);
- return drupal_render($build);
+ return drupal_render($build);
+ }
}
-}
+} \ No newline at end of file