summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormoshe weitzman2008-02-28 15:27:25 (GMT)
committer moshe weitzman2008-02-28 15:27:25 (GMT)
commit5b423f6c2a68afc1b208bd19d4240b59da250917 (patch)
tree3bac2f26d526126a74b6b96f854944e08deb2649
parent284cc99b93f76efccd236cb4ee52206ffc36dfe9 (diff)
defend devel against zend optimizer shittiness.
-rw-r--r--devel.module10
1 files changed, 9 insertions, 1 deletions
diff --git a/devel.module b/devel.module
index 7cf20d3..82223d6 100644
--- a/devel.module
+++ b/devel.module
@@ -777,10 +777,18 @@ function devel_db_query($query) {
function devel_admin_settings() {
$form['queries'] = array('#type' => 'fieldset', '#title' => t('Query log'));
+
+ $description = t("Collect query info. If disabled, no query log functionality will work.");
+ if (extension_loaded('Zend Optimizer')) {
+ $description = t('You must disable the php Zend Optimizer extension in order to enable this feature. Zend Optimizer is <a href="!url">horribly buggy and segfaults your Apache</a> ... ', array('!url' => url('http://drupal.org/node/126098'))). $description;
+ }
$form['queries']['dev_query'] = array('#type' => 'checkbox',
'#title' => t('Collect query info'),
'#default_value' => variable_get('dev_query', 0),
- '#description' => t("Collect query info. If disabled, no query log functionality will work."));
+ '#disabled' => extension_loaded('Zend Optimizer') ? TRUE : FALSE,
+ '#description' => $description,
+ );
+
$form['queries']['devel_query_display'] = array('#type' => 'checkbox',
'#title' => t('Display query log'),
'#default_value' => variable_get('devel_query_display', 0),