Skip to content

Fix PHP 5.X compat issue in block saving triggers string offset warning #103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Trav84 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix PHP 5.X compat issue in block saving triggers string offset warning #103

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f8a3359
Fix PHP 5.X compat issue in block saving
Trav84 Apr 29, 2016
733bc6c
Merge pull request #1 from Favish/php-block-admin-compat
Trav84 Apr 29, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions modules/block/block.admin.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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']);
Expand Down