Commit 22829055 authored by Dries's avatar Dries

- Patch #22531 by Morbus: the CHANGELOG for Drupal 4.5 claims that a URL alias...

- Patch #22531 by Morbus: the CHANGELOG for Drupal 4.5 claims that a URL alias of "rss.xml" for "node/feed" was added. This ONLY occurs in updates.inc however - if people grab a fresh 4.5 (or now, 4.6), they are never going to get this added alias. The attached patch adds this INSERT into the default database.* files, adds another update into the updates.inc (so that those who started with a fresh 4.5 or 4.6 will get it via update.php the next time around) and fixes some minor whitespace/style inconsistencies.
parent 55dc257b
......@@ -786,8 +786,8 @@ INSERT INTO system VALUES ('modules/system.module','system','module','',1,0,0);
INSERT INTO system VALUES ('modules/taxonomy.module','taxonomy','module','',1,0,0);
INSERT INTO system VALUES ('modules/user.module','user','module','',1,0,0);
INSERT INTO system VALUES ('modules/watchdog.module','watchdog','module','',1,0,0);
INSERT INTO `system` VALUES ('themes/engines/phptemplate/phptemplate.engine', 'phptemplate', 'theme_engine', '', 1, 0, 0);
INSERT INTO `system` VALUES ('themes/bluemarine/page.tpl.php', 'bluemarine', 'theme', 'themes/engines/phptemplate/phptemplate.engine', 1, 0, 0);
INSERT INTO system VALUES ('themes/engines/phptemplate/phptemplate.engine', 'phptemplate', 'theme_engine', '', 1, 0, 0);
INSERT INTO system VALUES ('themes/bluemarine/page.tpl.php', 'bluemarine', 'theme', 'themes/engines/phptemplate/phptemplate.engine', 1, 0, 0);
INSERT INTO users (uid, name, mail) VALUES ('0', '', '');
INSERT INTO users_roles (uid, rid) VALUES (0, 1);
......@@ -818,3 +818,5 @@ INSERT INTO filters VALUES (3,'filter',2,0);
INSERT INTO variable (name,value) VALUES ('filter_html_1','i:1;');
INSERT INTO locales_meta (locale, name, enabled, isdefault) VALUES ('en', 'English', '1', '1');
INSERT INTO url_alias (src, dst) VALUES ('node/feed', 'rss.xml');
......@@ -783,8 +783,8 @@ INSERT INTO system VALUES ('modules/system.module','system','module','',1,0,0);
INSERT INTO system VALUES ('modules/taxonomy.module','taxonomy','module','',1,0,0);
INSERT INTO system VALUES ('modules/user.module','user','module','',1,0,0);
INSERT INTO system VALUES ('modules/watchdog.module','watchdog','module','',1,0,0);
INSERT INTO `system` VALUES ('themes/engines/phptemplate/phptemplate.engine', 'phptemplate', 'theme_engine', '', 1, 0, 0);
INSERT INTO `system` VALUES ('themes/bluemarine/page.tpl.php', 'bluemarine', 'theme', 'themes/engines/phptemplate/phptemplate.engine', 1, 0, 0);
INSERT INTO system VALUES ('themes/engines/phptemplate/phptemplate.engine', 'phptemplate', 'theme_engine', '', 1, 0, 0);
INSERT INTO system VALUES ('themes/bluemarine/page.tpl.php', 'bluemarine', 'theme', 'themes/engines/phptemplate/phptemplate.engine', 1, 0, 0);
INSERT INTO variable(name,value) VALUES('update_start', 's:10:"2005-03-21";');
INSERT INTO variable(name,value) VALUES('theme_default','s:10:"bluemarine";');
......@@ -811,14 +811,15 @@ INSERT INTO filters VALUES (2,'filter',1,0);
INSERT INTO filters VALUES (3,'filter',2,0);
INSERT INTO variable (name,value) VALUES ('filter_html_1','i:1;');
INSERT INTO locales_meta(locale, name, enabled, isdefault) VALUES('en', 'English', '1', '1');
INSERT INTO locales_meta (locale, name, enabled, isdefault) VALUES ('en', 'English', '1', '1');
INSERT INTO url_alias (src, dst) VALUES ('node/feed', 'rss.xml');
---
--- Alter some sequences
---
ALTER SEQUENCE menu_mid_seq RESTART 2;
---
--- Functions
---
......@@ -839,7 +840,6 @@ CREATE FUNCTION greatest(integer, integer, integer) RETURNS integer AS '
SELECT greatest($1, greatest($2, $3));
' LANGUAGE 'sql';
CREATE FUNCTION "rand"() RETURNS float AS '
BEGIN
RETURN random();
......
......@@ -113,7 +113,8 @@
"2005-04-30" => "update_134",
"2005-05-06" => "update_135",
"2005-05-08" => "update_136",
"2005-05-09" => "update_137"
"2005-05-09" => "update_137",
"2005-05-10" => "update_138"
);
function update_32() {
......@@ -2457,7 +2458,7 @@ function update_136() {
return $ret;
}
function update_137() {
function update_137() {
$ret = array();
if ($GLOBALS['db_type'] == 'mysql') {
......@@ -2470,8 +2471,15 @@ function update_137() {
$ret[] = update_sql("ALTER TABLE {locales_source} ALTER location SET DEFAULT ''");
$ret[] = update_sql("UPDATE {locales_source} SET location = location_old");
$ret[] = update_sql("ALTER TABLE {locales_source} DROP location_old");
}
return $ret;
}
return $ret;
}
function update_138() {
$ret = array();
// duplicate of update_97 which never got into the default database.* files.
$ret[] = update_sql("INSERT INTO {url_alias} (src, dst) VALUES ('node/feed', 'rss.xml')");
return $ret;
}
function update_sql($sql) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment