nasty interaction between devel_themer and dhtml_menu

haven't figured out how to disable it, but at least gives a CLEAR
warning.
This commit is contained in:
espie 2009-09-20 13:24:29 +00:00
parent 539203f259
commit 7b8dc187e8
3 changed files with 25 additions and 2 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.2 2009/09/03 13:20:22 espie Exp $
# $OpenBSD: Makefile,v 1.3 2009/09/20 13:24:29 espie Exp $
COMMENT = development helps
DISTNAME = devel-6.x-1.17
PKGNAME = drupal6-devel-1.17
PKGNAME = drupal6-devel-1.17p0
.include <bsd.port.mk>

View File

@ -0,0 +1,20 @@
$OpenBSD: patch-devel_themer_install,v 1.1 2009/09/20 13:24:29 espie Exp $
--- devel_themer.install.orig Sat Aug 16 15:05:59 2008
+++ devel_themer.install Sun Sep 20 14:56:48 2009
@@ -2,7 +2,15 @@
function devel_themer_requirements($phase) {
// Ensure translations don't break at install time
- $t = get_t();
+ $t = get_t();
+ if (module_exists('dhtml_menu')) {
+ $requirements['dhtml_menu'] = array(
+ 'title' => t('devel_themer'),
+ 'value' => t('dhtml_menu conflict'),
+ 'description' => $t('This module is incompatible with dhtml_menu'),
+ 'severity' => REQUIREMENT_ERROR,
+ );
+ }
if ($phase == 'install' || $phase == 'runtime') {
// we need the Optimizer check function

View File

@ -5,3 +5,6 @@ Activate the modules, then add the blocks where you want them, and make
sure the roles have the correct permissions.
Do not use on production sites, for obvious reasons...
PLEASE NOTE: devel_themer is incompatible with dhtml_menu !!!!
DO NOT activate them both at once.