Webmin apache module didn't detect pid file correctly on new Debian apache package (add $SUFFIX to file name)

I have use Debian testing version (squeeze) and see that Webmin apache module can't detect pid file, but before upgrade - it see the file normally.

The problem is because in apache config file debian maintainers adds "$SUFFIX" variable:
In /etc/apache2/apache2.conf:
PidFile ${APACHE_PID_FILE}

In /etc/apache2/envvars
# for supporting multiple apache2 instances
if [ "${APACHE_CONFDIR##/etc/apache2-}" != "${APACHE_CONFDIR}" ] ; then
SUFFIX="-${APACHE_CONFDIR##/etc/apache2-}"
else
SUFFIX=
fi
...
export APACHE_PID_FILE=/var/run/apache2$SUFFIX.pid
export APACHE_RUN_DIR=/var/run/apache2$SUFFIX
export APACHE_LOCK_DIR=/var/lock/apache2$SUFFIX
# Only /var/log/apache2 is handled by /etc/logrotate.d/apache2.
export APACHE_LOG_DIR=/var/log/apache2$SUFFIX

And Webmin detects path to pid file like "/var/run/apache2$SUFFIX.pid', it didn't resolve $SUFFIX variable to value.

If I remove $SUFFIX from string with APACHE_PID_FILE, Webmin detects file normally.

Changing $SUFFIX to ${SUFFIX} in this line like in apache2.conf didn't help.

Same config and problem I see in Ubuntu 10.10.

Seems that the apache config files like this will be in all new Debian and Ubuntu versions, so for add support for new versions you must do some workaround for this in Webmin.

Can you do the patch for Webmin that works normally with new apache2 config formats?