Branch: Tag:

2003-06-30

2003-06-30 16:49:14 by 0

Improved support for Roxen CMS edit areas and multilingual files.

Rev: server/modules/graphics/gbutton.pike:1.98

25:   // must also be aligned left or right.       - constant cvs_version = "$Id: gbutton.pike,v 1.97 2002/09/05 12:28:17 jonasw Exp $"; + constant cvs_version = "$Id: gbutton.pike,v 1.98 2003/06/30 16:49:14 jonasw Exp $";   constant thread_safe = 1;      #include <module.h>
263:       if( args->border_image )    { -  array(Image.Layer)|mapping tmp = roxen.load_layers(args->border_image, id); +  array(Image.Layer)|mapping tmp; +  + #if constant(Sitebuilder) +  // Let SiteBuilder get a chance to decode its argument data +  if (Sitebuilder.sb_start_use_imagecache) { +  Sitebuilder.sb_start_use_imagecache(args, id); +  tmp = roxen.load_layers(args->border_image, id); +  Sitebuilder.sb_end_use_imagecache(args, id); +  } else + #endif +  { +  tmp = roxen.load_layers(args->border_image, id); +  } +     if (mappingp(tmp))    if (tmp->error == 401)    return tmp;
790:    "gamma":args["gamma"],    "crop":args["crop"],    ]); -  if( fi ) +  if( fi ) {    new_args->stat = get_file_stat( fi, id ); -  + #if constant(Sitebuilder) +  // The file we called get_file_stat() on above may be a SiteBuilder +  // file. If so we need to extend the argument data with e.g. +  // current language fork. +  if (Sitebuilder.sb_prepare_imagecache) +  new_args = Sitebuilder.sb_prepare_imagecache(new_args, fi, id); + #endif +  }       new_args->quant = args->quant || 128;    foreach(glob("*-*", indices(args)), string n)