Roxen.git/ server/ modules/ graphics/ gbutton.pike

2002-10-23

2002-10-23 23:36:30 by Martin Nilsson <mani@lysator.liu.se>

• 17ca73ef148e903310bb57760ba0a7ca32ad7bab (9 lines) (+7/-2) ^{[ Show | Annotate ]}
  Branch: Aphoto_2.0_beta3

Stating a file could have the side effect of setting id->misc->stat,
which in turn could mean t hat Last-Modified for the requested page
got it's value from the stated file. Now id->misc->sta t is hopefully
never set for internal requests/stat calls.

Fixed somewhat incorrect text centering in combination with right-aligned
icon.
[1.97]

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

25:   // must also be aligned left or right.       - constant cvs_version = "$Id: gbutton.pike,v 1.95 2002/06/18 16:17:13 nilsson Exp $"; + constant cvs_version = "$Id: gbutton.pike,v 1.96 2002/10/23 23:36:30 nilsson Exp $";   constant thread_safe = 1;      #include <module.h>
479:    break;    case "right":    icn_x = req_width - right - i_width; -  txt_x = left + (icn_x - i_spc - t_width) / 2; +  txt_x = left + (icn_x - i_spc - t_width - left) / 2;    break;    }    break;
717:    return (res > 0) && res;       call_out( m_delete, 10, __stat_cache, f ); +  int was_internal = id->misc->internal_get; +  id->misc->internal_get = 1;    res = __stat_cache[ f ] = (id->conf->stat_file( f,id )    || file_stat( f )    || ({ 0,0,0,0 }))[ST_MTIME] || -1; -  +  if (!was_internal) +  m_delete(id->misc, "internal_get");    return (res > 0) && res;   }