[cvs] commit: wicked/lib/Page MergeOrRename.php wicked/templates/display standard.inc

[Jan Schneider]

jan         2010-02-14 17:32:37 UTC

  Modified files:        (Branch: FRAMEWORK_3)
    lib/Page             MergeOrRename.php 
    templates/display    standard.inc 
  Log:
  Check for lock when renaming/merging.
  
  Revision  Changes    Path
  1.28.2.2  +22 -1     wicked/lib/Page/MergeOrRename.php
  1.50.2.2  +2 -2      wicked/templates/display/standard.inc

  Chora Links:
  http://cvs.horde.org/diff.php/wicked/lib/Page/MergeOrRename.php?rt=horde&r1=1.28.2.1&r2=1.28.2.2&ty=u
  http://cvs.horde.org/diff.php/wicked/templates/display/standard.inc?rt=horde&r1=1.50.2.1&r2=1.50.2.2&ty=u