Mercurial > defr > drupal > core

comparison modules/block/block.admin.inc @ 3:165d43f946a8 6.1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Drupal 6.1
author Franck Deroche <webmaster@defr.org>
date Tue, 23 Dec 2008 14:29:21 +0100
parents c1f4ac30525a
children fff6d4c8c043
comparison
equal deleted inserted replaced
2:85b5b336180c 3:165d43f946a8
1 <?php 1 <?php
2 // $Id: block.admin.inc,v 1.14 2007/12/22 23:24:24 goba Exp $ 2 // $Id: block.admin.inc,v 1.14.2.1 2008/02/27 12:07:42 goba Exp $
3 3
4 /** 4 /**
5 * @file 5 * @file
6 * Admin page callbacks for the block module. 6 * Admin page callbacks for the block module.
7 */ 7 */
121 $status = $b['status'] - $a['status']; 121 $status = $b['status'] - $a['status'];
122 if ($status) { 122 if ($status) {
123 return $status; 123 return $status;
124 } 124 }
125 // Sort by region (in the order defined by theme .info file). 125 // Sort by region (in the order defined by theme .info file).
126 $place = $regions[$a['region']] - $regions[$b['region']]; 126 if ((!empty($a['region']) && !empty($b['region'])) && ($place = ($regions[$a['region']] - $regions[$b['region']]))) {
127 if ($place) {
128 return $place; 127 return $place;
129 } 128 }
130 // Sort by weight. 129 // Sort by weight.
131 $weight = $a['weight'] - $b['weight']; 130 $weight = $a['weight'] - $b['weight'];
132 if ($weight) { 131 if ($weight) {