summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2009-12-02 19:39:05 +0000
committerDries Buytaert <dries@buytaert.net>2009-12-02 19:39:05 +0000
commit2845fa952af35c66555bda24899256537222af67 (patch)
treefd15ea1b164d1ae575ae29fac07be29c63a453fe
parent0baad49d620d9988837287cb5942eea764d3ed6f (diff)
downloadbrdo-2845fa952af35c66555bda24899256537222af67.tar.gz
brdo-2845fa952af35c66555bda24899256537222af67.tar.bz2
- Patch #648710 by pwolanin, Gábor Hojtsy: fixed error when creating new block without region.
-rw-r--r--modules/block/block.admin.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/block/block.admin.inc b/modules/block/block.admin.inc
index a747a5b4e..d4941eb15 100644
--- a/modules/block/block.admin.inc
+++ b/modules/block/block.admin.inc
@@ -413,7 +413,7 @@ function block_admin_configure_submit($form, &$form_state) {
db_merge('block')
->key(array('theme' => $theme, 'delta' => $form_state['values']['delta'], 'module' => $form_state['values']['module']))
->fields(array(
- 'region' => $region,
+ 'region' => ($region == BLOCK_REGION_NONE ? '' : $region),
'pages' => trim($form_state['values']['pages']),
'status' => (int) ($region != BLOCK_REGION_NONE),
))
@@ -498,7 +498,7 @@ function block_add_block_form_submit($form, &$form_state) {
db_merge('block')
->key(array('theme' => $theme, 'delta' => $delta, 'module' => $form_state['values']['module']))
->fields(array(
- 'region' => $region,
+ 'region' => ($region == BLOCK_REGION_NONE ? '' : $region),
'pages' => trim($form_state['values']['pages']),
'status' => (int) ($region != BLOCK_REGION_NONE),
))