summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/admin.module3
-rw-r--r--modules/system.module2
-rw-r--r--modules/system/system.module2
3 files changed, 6 insertions, 1 deletions
diff --git a/modules/admin.module b/modules/admin.module
index 29d49a2c2..28a8aa136 100644
--- a/modules/admin.module
+++ b/modules/admin.module
@@ -20,7 +20,7 @@ function admin_admin() {
}
function admin_page() {
- global $user;
+ global $user, $base_url;
if (user_access("access administration pages")) {
page_header();
@@ -30,6 +30,7 @@ function admin_page() {
<html>
<head>
<title><?php echo variable_get("site_name", "drupal") . " " . t("administration pages"); ?></title>
+ <base href="<?php echo "$base_url/" ?>" />
<link rel="stylesheet" type="text/css" media="print" href="misc/print.css" />
<style type="text/css" title="layout" media="Screen">
@import url("misc/admin.css");
diff --git a/modules/system.module b/modules/system.module
index 61a9d2d96..eac2ef928 100644
--- a/modules/system.module
+++ b/modules/system.module
@@ -57,6 +57,8 @@ function system_view_modules() {
$output .= form_textfield(t("Anonymous user"), "anonymous", variable_get("anonymous", "Anonymous"), 55, 55, t("The name used to indicate anonymous users."));
foreach (module_list() as $name) { if (module_hook($name, "page")) $pages[$name] = $name; }
$output .= form_select(t("Default front page"), "site_frontpage", variable_get("site_frontpage", "node"), $pages, t("The home page displays content from this module (usually node)."));
+ $output .= form_select(t("Clean URLs"), "clean_url", variable_get("clean_url", 0), array(t("Disabled"), t("Enabled")), t("Enable or disable clean URLs. If enabled, you'll need <code>ModRewrite</code> support. See also the <code>.htaccess</code> file in Drupal's top-level directory."));
+
$output .= "<hr />\n";
// caching:
diff --git a/modules/system/system.module b/modules/system/system.module
index 61a9d2d96..eac2ef928 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -57,6 +57,8 @@ function system_view_modules() {
$output .= form_textfield(t("Anonymous user"), "anonymous", variable_get("anonymous", "Anonymous"), 55, 55, t("The name used to indicate anonymous users."));
foreach (module_list() as $name) { if (module_hook($name, "page")) $pages[$name] = $name; }
$output .= form_select(t("Default front page"), "site_frontpage", variable_get("site_frontpage", "node"), $pages, t("The home page displays content from this module (usually node)."));
+ $output .= form_select(t("Clean URLs"), "clean_url", variable_get("clean_url", 0), array(t("Disabled"), t("Enabled")), t("Enable or disable clean URLs. If enabled, you'll need <code>ModRewrite</code> support. See also the <code>.htaccess</code> file in Drupal's top-level directory."));
+
$output .= "<hr />\n";
// caching: