Roxen.git/ server/ etc/ modules/ Roxen.pmod

2012-08-15

2012-08-15 12:44:53 by Henrik Grubbström (Grubba) <grubba@grubba.org>

• 0eebcafe2e53c4c76c85bb35a4037c44649999e1 (14 lines) (+7/-7) ^{[ Show | Annotate ]}
  Branch: 5.2

Roxen.Context: Moved test for [bug 6451 (#6451)].

Potentially fixes [bug 6451 (#6451)] #5.
Thanks to Eiichiro ITANI, <emu@ceres.dti.ne.jp>.

Rev: server/etc/modules/Roxen.pmod:1.335

1:   // This is a roxen pike module. Copyright © 1999 - 2009, Roxen IS.   // - // $Id: Roxen.pmod,v 1.334 2012/08/15 12:41:05 grubba Exp $ + // $Id: Roxen.pmod,v 1.335 2012/08/15 12:44:53 grubba Exp $      #include <roxen.h>   #include <config.h>
4229:       protected mixed `[]( string what )    { +  // NB: This function may be called by eg master()->describe_object() +  // with symbols such as "is_resolv_dirnode", in contexts where +  // the scope doesn't exist. cf [bug 6451].    RXML.Context ctx = RXML.get_context( ); -  return ctx->get_var( what, scope ); +  return ctx->scopes[scope || "_"] && ctx->get_var( what, scope );    }       protected mixed `->( string what )    { -  // NB: This function may be called by eg master()->describe_object() -  // with symbols such as "is_resolv_dirnode", in contexts where -  // the scope doesn't exist. cf [bug 6451]. -  RXML.Context ctx = RXML.get_context( ); -  return ctx->scopes[scope || "_"] && `[]( what ); +  return `[]( what );    }       protected mixed `[]=( string what, mixed nval )