summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
Diffstat (limited to 'includes')
-rw-r--r--includes/menu.inc6
-rw-r--r--includes/module.inc4
-rw-r--r--includes/theme.inc6
3 files changed, 8 insertions, 8 deletions
diff --git a/includes/menu.inc b/includes/menu.inc
index f21eb94d1..e56698176 100644
--- a/includes/menu.inc
+++ b/includes/menu.inc
@@ -591,7 +591,7 @@ function menu_rebuild() {
_menu_build();
- if (module_exist('menu')) {
+ if (module_exists('menu')) {
$menu = menu_get_menu();
// Fill a queue of new menu items which are modifiable.
@@ -828,7 +828,7 @@ function theme_menu_local_task($mid, $active, $primary) {
* -active is appended if this element is in the active trail.
*/
function menu_primary_links($start_level = 1, $pid = 0) {
- if (!module_exist('menu')) {
+ if (!module_exists('menu')) {
return NULL;
}
if (!$pid) {
@@ -1081,7 +1081,7 @@ function _menu_build() {
}
// Now fetch items from the DB, reassigning menu IDs as needed.
- if (module_exist('menu')) {
+ if (module_exists('menu')) {
$result = db_query(db_rewrite_sql('SELECT m.mid, m.* FROM {menu} m ORDER BY m.mid ASC', 'm', 'mid'));
while ($item = db_fetch_object($result)) {
// Handle URL aliases if entered in menu administration.
diff --git a/includes/module.inc b/includes/module.inc
index 25beb7172..f25331730 100644
--- a/includes/module.inc
+++ b/includes/module.inc
@@ -136,7 +136,7 @@ function module_rebuild_cache() {
* @return
* TRUE if the module is both installed and enabled.
*/
-function module_exist($module) {
+function module_exists($module) {
$list = module_list();
return array_key_exists($module, $list);
}
@@ -181,7 +181,7 @@ function module_enable($module) {
* The name of the module (without the .module extension).
*/
function module_disable($module) {
- if (module_exist($module)) {
+ if (module_exists($module)) {
module_load_install($module);
module_invoke($module, 'disable');
db_query("UPDATE {system} SET status = 0, throttle = 0 WHERE type = 'module' AND name = '%s'", $module);
diff --git a/includes/theme.inc b/includes/theme.inc
index e9bd3f3f6..54ee5af03 100644
--- a/includes/theme.inc
+++ b/includes/theme.inc
@@ -244,7 +244,7 @@ function theme_get_settings($key = NULL) {
'toggle_comment_user_picture' => 0,
);
- if (module_exist('node')) {
+ if (module_exists('node')) {
foreach (node_get_types() as $type => $name) {
$defaults['toggle_node_info_' . $type] = 1;
}
@@ -256,7 +256,7 @@ function theme_get_settings($key = NULL) {
}
// Only offer search box if search.module is enabled.
- if (!module_exist('search') || !user_access('search content')) {
+ if (!module_exists('search') || !user_access('search content')) {
$settings['toggle_search'] = 0;
}
@@ -600,7 +600,7 @@ function theme_node($node, $teaser = FALSE, $page = FALSE) {
$output = '<div class="node-unpublished">';
}
- if (module_exist('taxonomy')) {
+ if (module_exists('taxonomy')) {
$terms = taxonomy_link('taxonomy terms', $node);
}