- Patch #212608 by Gábor Hojtsy, webchick, stefgosselin: fixed E_NOTICE on block administration.

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.

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) {