From f8a3359568e54208eb6d87c1f8d54c88bc60b56d Mon Sep 17 00:00:00 2001
From: "Travis C. Czerw" <travis.czerw@gmail.com>
Date: Fri, 29 Apr 2016 11:49:55 -0500
Subject: [PATCH] Fix PHP 5.X compat issue in block saving

D6 naively assumed that all elements int he $form_state['values'] array are blocks. PHP 5.5+ throw a warning. This skips over those non array based elements in the loop.

Drupal issue upstream closed because of EOL: https://www.drupal.org/node/1680614
---
 modules/block/block.admin.inc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/block/block.admin.inc b/modules/block/block.admin.inc
index 3fd8280a9c7..ac2f4a7d753 100644
--- a/modules/block/block.admin.inc
+++ b/modules/block/block.admin.inc
@@ -98,6 +98,9 @@ function block_admin_display_form(&$form_state, $blocks, $theme = NULL) {
  */
 function block_admin_display_form_submit($form, &$form_state) {
   foreach ($form_state['values'] as $block) {
+    // Skip over non block elements in this form like 'form_id' and 'submit'.
+    if (!is_array($block)) { continue; }
+    
     $block['status'] = $block['region'] != BLOCK_REGION_NONE;
     $block['region'] = $block['status'] ? $block['region'] : '';
     db_query("UPDATE {blocks} SET status = %d, weight = %d, region = '%s', throttle = %d WHERE module = '%s' AND delta = '%s' AND theme = '%s'", $block['status'], $block['weight'], $block['region'], isset($block['throttle']) ? $block['throttle'] : 0, $block['module'], $block['delta'], $block['theme']);