diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2008-11-23 20:29:36 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2008-11-23 20:29:36 +0000 |
| commit | c30376a50b1499b4c29029fb7a8bcaf7a1072194 (patch) | |
| tree | b6289a0e2830d4740653bfa51497fc9c4b95e374 /modules/system/system.install | |
| parent | d57314014c5e8f2c03ebe6e4e3676a75c57503d4 (diff) | |
| download | brdo-c30376a50b1499b4c29029fb7a8bcaf7a1072194.tar.gz brdo-c30376a50b1499b4c29029fb7a8bcaf7a1072194.tar.bz2 | |
#337820 follow-up: Reverting conflict cruft that somehow got introduced the last commit.
Diffstat (limited to 'modules/system/system.install')
| -rw-r--r-- | modules/system/system.install | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/modules/system/system.install b/modules/system/system.install index f6601b95e..bcde1b943 100644 --- a/modules/system/system.install +++ b/modules/system/system.install @@ -3090,18 +3090,6 @@ 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() { @@ -3143,7 +3131,6 @@ function system_update_7013() { } /** ->>>>>>> 1.282 * @} End of "defgroup updates-6.x-to-7.x" * The next series of updates should start at 8000. */ |