BitKeeper Patch

This BitKeeper patch contains the following changesets:
12709

# User:	garrett
# Host:	orthanc.blacktower.com
# Root:	/opt/xaraya/xaraya-stable

# Patch vers:	1.3
# Patch type:	REGULAR

== ChangeSet ==
[email protected]|ChangeSet|20020928131446|19176|e333bc156eae828a
marc@marclaptop.|ChangeSet|20030611160820|56884
D 1.1028 03/06/11 10:52:35-07:00 [email protected] +2 -0 B
[email protected]|ChangeSet|20020928131446|19176|e333bc156eae828a
C
c xarBlocks.php:
c   bugfix#610 - xarBlock_renderGroup was overriding the block_instances
template with the block_groups template
K 58761
P ChangeSet
------------------------------------------------

0a0
> BK|html/includes/pnBlocks.php|19700101030959|00950|34b2332fc0599c1 
> BK|[email protected]|html/includes/xarBlocks.php|20030611
> BK|174944|27928
> [email protected]|BitKeeper/etc/logging_ok|20020928132559|02556|36872
> ac13653ac68 
> [email protected]|BitKeeper/etc/logging_ok|20030611175221
> |01494

== html/includes/xarBlocks.php ==
BK|html/includes/pnBlocks.php|19700101030959|00950|34b2332fc0599c1
[email protected]|html/includes/xarBlocks.php|20030511190357|05805
D 1.94 03/06/11 10:49:44-07:00 [email protected] +8 -1 B
[email protected]|ChangeSet|20020928131446|19176|e333bc156eae828a
C
c bugfix#610 - xarBlock_renderGroup was overriding the block_instances
template with the block_groups template K 27928 O -rw-rw-r-- P
html/includes/xarBlocks.php
------------------------------------------------

D388 1
I388 2
                        bgroups.xar_template as bgroups_bl_template,
                        inst.xar_template as inst_bl_template
I406 6
\
	if (!empty($blockInfo['inst_bl_template'])) {
	    $blockInfo['_bl_template'] = $blockInfo['inst_bl_template'];
	} else {
	    $blockInfo['_bl_template'] = $blockInfo['bgroups_bl_template'];
	}	

== BitKeeper/etc/logging_ok ==
[email protected]|BitKeeper/etc/logging_ok|20020928132559|02556|36872ac1365
3ac68
mikespub-111RdWWlOxkOkXtL6OYfHgC/[email protected]|BitKeeper/etc/logging_ok|20030610202830|63963
D 1.87 03/06/11 10:52:21-07:00 [email protected] +1 -0 B
[email protected]|ChangeSet|20020928131446|19176|e333bc156eae828a
C
c Logging to [email protected] accepted K 1494 O -rw-rw-r-- P
BitKeeper/etc/logging_ok
------------------------------------------------

I31 1
[email protected]

# Patch checksum=926ba65a