summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/system/system.install13
-rw-r--r--modules/system/system.module2
2 files changed, 14 insertions, 1 deletions
diff --git a/modules/system/system.install b/modules/system/system.install
index bcde1b943..f6601b95e 100644
--- a/modules/system/system.install
+++ b/modules/system/system.install
@@ -3090,6 +3090,18 @@ function system_update_7012() {
}
/**
+<<<<<<< system.install
+ * Change the user logout path.
+ */
+function system_update_7014() {
+ $ret = array();
+ $ret[] = update_sql("UPDATE {menu_links} SET link_path = 'user/login' WHERE link_path = 'login'");
+ $ret[] = update_sql("UPDATE {menu_links} SET router_path = 'user/login' WHERE router_path = 'login'");
+ return $ret;
+}
+
+/**
+=======
* Convert default time zone offset to default time zone name.
*/
function system_update_7013() {
@@ -3131,6 +3143,7 @@ function system_update_7013() {
}
/**
+>>>>>>> 1.282
* @} End of "defgroup updates-6.x-to-7.x"
* The next series of updates should start at 8000.
*/
diff --git a/modules/system/system.module b/modules/system/system.module
index a85e3fa49..151c26979 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -209,7 +209,7 @@ function system_perm() {
}
/**
- * Implementation of hook_rdf_namespace().
+ * Implementation of hook_rdf_namespaces().
*/
function system_rdf_namespaces() {
return array(