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

2009-06-24

2009-06-24 09:33:31 by Jonas Wallden <jonasw@roxen.com>

• 529f61514aae5750a45a812a4de714f4ba229a5a (10 lines) (+9/-1) ^{[ Show | Annotate ]}
  Branch: 5.2

Add additional checks to avoid effects of [bug 4850 (#4850)].

Rev: server/etc/modules/Variable.pmod/module.pmod:1.114

1: - // $Id: module.pmod,v 1.113 2008/12/19 12:17:32 grubba Exp $ + // $Id: module.pmod,v 1.114 2009/06/24 09:33:31 jonasw Exp $      #include <module.h>   #include <roxen.h>
1369:       array get_choice_list( )    { +  if (!functionp(config)) { +  // Some modules apparently send in a configration reference instead of +  // a function pointer when calling set_configuration_pointer(). +  report_warning("Incorrect usage of Variable.DatabaseChoice:\n\n%s", +  describe_backtrace(backtrace())); +  return ({ " none" }); +  }    return ({ " none" }) + sort(DBManager.list( config() ));    }