[cvs] commit: horde/docs CHANGES framework/Block/Block Collection.php horde/templates/portal layout.inc

[Michael Rubinsky]

mrubinsk    2010-07-15 16:53:50 UTC

  Modified files:        (Branch: FRAMEWORK_3)
    docs                 CHANGES 
    Block/Block          Collection.php 
    templates/portal     layout.inc 
  Log:
  Merge from Git:
  [mjr] Don't allow fixed blocks to be changed to another type
  Bug: 9141
  
  Revision     Changes    Path
  1.36.4.23    +7 -2      framework/Block/Block/Attic/Collection.php
  1.515.2.612  +1 -0      horde/docs/CHANGES
  1.18.10.9    +1 -1      horde/templates/portal/layout.inc

  Chora Links:
  http://cvs.horde.org/diff.php/framework/Block/Block/Attic/Collection.php?rt=horde&r1=1.36.4.22&r2=1.36.4.23&ty=u
  http://cvs.horde.org/diff.php/horde/docs/CHANGES?rt=horde&r1=1.515.2.611&r2=1.515.2.612&ty=u
  http://cvs.horde.org/diff.php/horde/templates/portal/layout.inc?rt=horde&r1=1.18.10.8&r2=1.18.10.9&ty=u