summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEarl Miles2007-01-18 05:49:04 (GMT)
committer Earl Miles2007-01-18 05:49:04 (GMT)
commitc2b7d25c797329df18911cb0ed3e7000bb0000c4 (patch)
tree76fac3bf226270a6bbe5a229bb51f2fc2f8cf6ca
parent82ade9aa1a9b712ca1fd779c7d00b4a34fc1124b (diff)
#107218: Fixed some E_NOTICE errors.
-rw-r--r--CHANGELOG.txt1
-rw-r--r--modules/views_comment.inc2
-rw-r--r--modules/views_taxonomy.inc1
-rw-r--r--modules/views_user.inc1
-rw-r--r--views_ui.module3
5 files changed, 7 insertions, 1 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 08332c0..7ea5def 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -98,3 +98,4 @@ Views 4.7.x-dev
o 106460: Update of module weight was not run on install of 1.4, causing taxonomy/term view to not override Drupal default.
o 107974: Ensure file_revisions table is added to query when using 'node has files' filter.
o 107371: Correct spelling of 'weather' to 'whether'.
+ o 107218: Fixed some E_NOTICE errors. \ No newline at end of file
diff --git a/modules/views_comment.inc b/modules/views_comment.inc
index b8b7bed..e36c9f4 100644
--- a/modules/views_comment.inc
+++ b/modules/views_comment.inc
@@ -209,6 +209,7 @@ function views_query_handler_field_last_comment_name($field, $fieldinfo, &$query
}
function views_handler_field_last_comment_name($fieldinfo, $fielddata, $value, $data) {
+ $obj = new stdClass();
$obj->name = $value;
$uidfield = $fielddata['tablename'] . "_" . $fieldinfo['uid'];
$obj->uid = $data->$uidfield;
@@ -247,6 +248,7 @@ function views_handler_field_commentlink_with_mark($fieldinfo, $fielddata, $valu
* Format a field as a comment
*/
function views_handler_field_comment($fieldinfo, $fielddata, $value, $data) {
+ $obj = new stdClass();
$obj->comment = check_markup($data->comments_comment, $data->comments_format, FALSE);
comment_invoke_comment($obj, 'view');
return $obj->comment;
diff --git a/modules/views_taxonomy.inc b/modules/views_taxonomy.inc
index 13d5ccd..0858787 100644
--- a/modules/views_taxonomy.inc
+++ b/modules/views_taxonomy.inc
@@ -251,6 +251,7 @@ function views_handler_field_allterms($fieldinfo, $fielddata, $value, $data) {
}
}
else {
+ $node = new stdClass();
$node->taxonomy = $terms;
$links = taxonomy_link('taxonomy terms', $node);
}
diff --git a/modules/views_user.inc b/modules/views_user.inc
index 0090800..53dfc5a 100644
--- a/modules/views_user.inc
+++ b/modules/views_user.inc
@@ -184,6 +184,7 @@ function user_views_query_substitutions($view) {
* specified in the field info.
*/
function views_handler_field_username($fieldinfo, $fielddata, $value, $data) {
+ $obj = new stdClass();
$obj->name = $value;
$uidfield = $fielddata['tablename'] . "_" . $fieldinfo['uid'];
$obj->uid = $data->$uidfield;
diff --git a/views_ui.module b/views_ui.module
index 6a6efe6..b8a27b9 100644
--- a/views_ui.module
+++ b/views_ui.module
@@ -349,7 +349,7 @@ function views_import_view_submit($formid, $form) {
ob_end_clean();
$tables = array_keys(_views_get_tables());
- if ($view) {
+ if (isset($view)) {
if (!is_array($view->requires) || !array_diff($view->requires, $tables)) {
views_sanitize_view($view);
drupal_set_title(t('Add a View'));
@@ -679,6 +679,7 @@ function _views_view_form($view, $op = '') {
_views_check_arrays($view); // make sure arrays that might be empty get set
// Put in all our add buttons, then process them to see if they've been hit.
+ $form = array();
views_ui_add_add_button($form, 'field', _views_get_fields(true), t('Add Field'));
views_ui_add_add_button($form, 'argument', _views_get_arguments(true), t('Add Argument'));
views_ui_add_add_button($form, 'filter', _views_get_filters(true), t('Add Filter'));