cvs: php4 /ext/midgard midgard.c

emile Thu Mar 15 02:56:56 2001 EDT Modified files: /php4/ext/midgard midgard.c Log: Remove php_error for situations where Midgard is loaded but not configured (which is valid). Index: php4/ext/midgard/midgard.c diff -u php4/ext/midgard/midgard.c:1.22 php4/ext/midgard/midgard.c:1.23 --- php4/ext/midgard/midgard.c:1.22 Sat Mar 10 14:43:10 2001 +++ php4/ext/midgard/midgard.c Thu Mar 15 02:56:56 2001 @@ -1,4 +1,4 @@ -/* $Id: midgard.c,v 1.22 2001/03/10 22:43:10 emile Exp $ +/* $Id: midgard.c,v 1.23 2001/03/15 10:56:56 emile Exp $ Copyright (C) 1999 Jukka Zitting <jukka.zitting@iki.fi> Copyright (C) 2000 The Midgard Project ry Copyright (C) 2000 Emile Heyns, Aurora SA <emile@iris-advies.com> @@ -390,9 +390,10 @@ MGDG(rcfg) = (midgard_request_config *) ap_get_module_config(r->request_config, midgard_module); if(MGDG(rcfg) == NULL) { + /* Midgard is probably not enabled for this host, only log debug info */ MGD_LOG_START("Cannot get midgard module config") MGD_LOG_END() - php_error(E_NOTICE, "Cannot get midgard module config"); + MGDG(rcfg) = NULL; MGDG(dcfg) = NULL; return SUCCESS; @@ -403,6 +404,10 @@ if(MGDG(dcfg) == NULL) { MGD_LOG_START("Cannot get midgard module directory config") MGD_LOG_END() + + /* this is an error, since if we can get the module config we should + also be able to get this + */ php_error(E_NOTICE, "Cannot get midgard module directory config"); MGDG(rcfg) = NULL; MGDG(dcfg) = NULL;