From 97bc9fb8286471217d55d6b93e547ba0b5abc38f Mon Sep 17 00:00:00 2001
From: webchick <webchick@24967.no-reply.drupal.org>
Date: Wed, 13 Jul 2011 21:48:34 -0400
Subject: [PATCH] Issue #348448 follow-up by jrchamp, catch: Fix E_STRICT
errors and set Drupal 8's default error reporting to E_STRICT to prevent
further regressions.
---
includes/bootstrap.inc | 4 ++--
modules/field_ui/field_ui.test | 3 ++-
modules/poll/poll.module | 4 ++++
modules/profile/profile.module | 1 +
modules/search/tests/search_embedded_form.module | 3 ++-
5 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc
index d37a98e4c927..06f8c68441ff 100644
--- a/includes/bootstrap.inc
+++ b/includes/bootstrap.inc
@@ -483,8 +483,8 @@ function drupal_environment_initialize() {
// e.g. "&" or "%" that have special meanings in URLs and must be encoded.
$_GET['q'] = request_path();
- // Enforce E_ALL, but allow users to set levels not part of E_ALL.
- error_reporting(E_ALL | error_reporting());
+ // Enforce E_STRICT, but allow users to set levels not part of E_STRICT.
+ error_reporting(E_STRICT | E_ALL | error_reporting());
// Override PHP settings required for Drupal to work properly.
// sites/default/default.settings.php contains more runtime settings.
diff --git a/modules/field_ui/field_ui.test b/modules/field_ui/field_ui.test
index 5d2ff9bfa5d9..9ff6c17203f5 100644
--- a/modules/field_ui/field_ui.test
+++ b/modules/field_ui/field_ui.test
@@ -613,7 +613,8 @@ class FieldUIManageDisplayTestCase extends FieldUITestCase {
// Render a cloned node, so that we do not alter the original.
$clone = clone $node;
- $output = drupal_render(node_view($clone, $view_mode));
+ $element = node_view($clone, $view_mode);
+ $output = drupal_render($element);
$this->verbose(t('Rendered node - view mode: @view_mode', array('@view_mode' => $view_mode)) . '<hr />'. $output);
// Assign content so that DrupalWebTestCase functions can be used.
diff --git a/modules/poll/poll.module b/modules/poll/poll.module
index f45b8bda7863..561e160c4bb3 100644
--- a/modules/poll/poll.module
+++ b/modules/poll/poll.module
@@ -485,6 +485,10 @@ function poll_load($nodes) {
foreach ($nodes as $node) {
$poll = db_query("SELECT runtime, active FROM {poll} WHERE nid = :nid", array(':nid' => $node->nid))->fetchObject();
+ if (empty($poll)) {
+ $poll = new stdClass;
+ }
+
// Load the appropriate choices into the $poll object.
$poll->choice = db_select('poll_choice', 'c')
->addTag('translatable')
diff --git a/modules/profile/profile.module b/modules/profile/profile.module
index 2374fe8ea071..1da4c6f47b8e 100644
--- a/modules/profile/profile.module
+++ b/modules/profile/profile.module
@@ -544,6 +544,7 @@ function template_preprocess_profile_block(&$variables) {
// Supply filtered version of $fields that have values.
foreach ($variables['fields'] as $field) {
if ($field->value) {
+ $variables['profile'][$field->name] = new stdClass;
$variables['profile'][$field->name]->title = check_plain($field->title);
$variables['profile'][$field->name]->value = $field->value;
$variables['profile'][$field->name]->type = $field->type;
diff --git a/modules/search/tests/search_embedded_form.module b/modules/search/tests/search_embedded_form.module
index c0058f74d06a..484579674576 100644
--- a/modules/search/tests/search_embedded_form.module
+++ b/modules/search/tests/search_embedded_form.module
@@ -65,5 +65,6 @@ function search_embedded_form_form_submit($form, &$form_state) {
* Adds the test form to search results.
*/
function search_embedded_form_preprocess_search_result(&$variables) {
- $variables['snippet'] .= drupal_render(drupal_get_form('search_embedded_form_form'));
+ $form = drupal_get_form('search_embedded_form_form');
+ $variables['snippet'] .= drupal_render($form);
}
--
GitLab