[cvs] commit: merk/carts edit.php merk/lib Merk.php merk/options delete_option.php index.php list_values.php merk/templates/browse browse.html

[Chuck Hagenbuch]

chuck       2006-04-17 20:11:14 PDT

  Modified files:
    carts                edit.php 
    lib                  Merk.php 
    options              delete_option.php index.php 
                         list_values.php 
    templates/browse     browse.html 
  Log:
  - always use Merk::lang()
  - if selected lang is not present in config, fall on the first listed
  - check for data in two places to avoid warnings
  Submitted by: Duck <duck at obala.net>
  
  Revision  Changes    Path
  1.28      +2 -2      merk/carts/edit.php
  1.20      +8 -3      merk/lib/Merk.php
  1.14      +6 -4      merk/options/delete_option.php
  1.17      +2 -2      merk/options/index.php
  1.17      +2 -1      merk/options/list_values.php
  1.10      +3 -3      merk/templates/browse/browse.html

  Chora Links:
  http://cvs.horde.org/diff.php/merk/carts/edit.php?r1=1.27&r2=1.28&ty=u
  http://cvs.horde.org/diff.php/merk/lib/Merk.php?r1=1.19&r2=1.20&ty=u
  http://cvs.horde.org/diff.php/merk/options/delete_option.php?r1=1.13&r2=1.14&ty=u
  http://cvs.horde.org/diff.php/merk/options/index.php?r1=1.16&r2=1.17&ty=u
  http://cvs.horde.org/diff.php/merk/options/list_values.php?r1=1.16&r2=1.17&ty=u
  http://cvs.horde.org/diff.php/merk/templates/browse/browse.html?r1=1.9&r2=1.10&ty=u