From 6636c0cc99fcbd28ad19e439da28115688968bcd Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Wed, 25 Jun 2008 09:52:41 +0000
Subject: =?UTF-8?q?-=20Patch=20#212608=20by=20G=C3=A1bor=20Hojtsy,=20webch?=
 =?UTF-8?q?ick,=20stefgosselin:=20fixed=20E=5FNOTICE=20on=20block=20admini?=
 =?UTF-8?q?stration.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/block/block.admin.inc  | 3 +--
 modules/node/content_types.inc | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'modules')

diff --git a/modules/block/block.admin.inc b/modules/block/block.admin.inc
index eeff541ed..f09b5a8b1 100644
--- a/modules/block/block.admin.inc
+++ b/modules/block/block.admin.inc
@@ -123,8 +123,7 @@ function _block_compare($a, $b) {
     return $status;
   }
   // Sort by region (in the order defined by theme .info file).
-  $place = $regions[$a['region']] - $regions[$b['region']];
-  if ($place) {
+  if ((!empty($a['region']) && !empty($b['region'])) && ($place = ($regions[$a['region']] - $regions[$b['region']]))) {
     return $place;
   }
   // Sort by weight.
diff --git a/modules/node/content_types.inc b/modules/node/content_types.inc
index d6e6b92e9..12273f850 100644
--- a/modules/node/content_types.inc
+++ b/modules/node/content_types.inc
@@ -364,7 +364,7 @@ function node_node_type($op, $info) {
 function node_type_reset(&$type) {
   $info_array = module_invoke_all('node_info');
   if (isset($info_array[$type->orig_type])) {
-    $info_array[$type->orig_type]['type'] = $type->orig_type; 
+    $info_array[$type->orig_type]['type'] = $type->orig_type;
     $info = _node_type_set_defaults($info_array[$type->orig_type]);
 
     foreach ($info as $field => $value) {
-- 
cgit v1.2.3