diff options
Diffstat (limited to 'modules/system')
| -rw-r--r-- | modules/system/system.install | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/modules/system/system.install b/modules/system/system.install index b0ebbe7ca..6335d08f2 100644 --- a/modules/system/system.install +++ b/modules/system/system.install @@ -879,14 +879,19 @@ function system_install() { db_query("INSERT INTO {node_type} (type, name, module, description, help, has_title, title_label, has_body, body_label, min_word_count, custom, modified, locked, orig_type) VALUES ('page', 'page', 'node', 'If you want to add a static page, like a contact page or an about page, use a page.', '', 1, 'Title', 1, 'Body', 0, 1, 1, 0, 'page')"); db_query("INSERT INTO {node_type} (type, name, module, description, help, has_title, title_label, has_body, body_label, min_word_count, custom, modified, locked, orig_type) VALUES ('story', 'story', 'node', 'Stories are articles in their simplest form: they have a title, a teaser and a body, but can be extended by other modules. The teaser is part of the body too. Stories may be used as a personal blog or for news articles.', '', 1, 'Title', 1, 'Body', 0, 1, 1, 0, 'story')"); - db_query("INSERT INTO {filter_formats} (name, roles, cache) VALUES ('Filtered HTML',',1,2,',1)"); db_query("INSERT INTO {filter_formats} (name, roles, cache) VALUES ('PHP code','',0)"); db_query("INSERT INTO {filter_formats} (name, roles, cache) VALUES ('Full HTML','',1)"); - db_query("INSERT INTO {filters} VALUES (1,'filter',0,0)"); - db_query("INSERT INTO {filters} VALUES (1,'filter',2,1)"); + + db_query("INSERT INTO {filters} VALUES (1,'filter',3,0)"); + db_query("INSERT INTO {filters} VALUES (1,'filter',0,1)"); + db_query("INSERT INTO {filters} VALUES (1,'filter',2,2)"); + db_query("INSERT INTO {filters} VALUES (2,'filter',1,0)"); - db_query("INSERT INTO {filters} VALUES (3,'filter',2,0)"); + + db_query("INSERT INTO {filters} VALUES (3,'filter',3,0)"); + db_query("INSERT INTO {filters} VALUES (3,'filter',2,1)"); + db_query("INSERT INTO {variable} (name,value) VALUES ('filter_html_1','i:1;')"); db_query("INSERT INTO {variable} (name, value) VALUES ('node_options_forum', '%s')", 'a:1:{i:0;s:6:"status";}'); @@ -3227,6 +3232,19 @@ function system_update_1009() { return $ret; } +function system_update_1010() { + $ret = array(); + + // Disable urlfilter.module, if it exists. + if (module_exists('urlfilter')) { + module_disable('urlfilter'); + $ret[] = update_sql("UPDATE {filter_formats} SET module = 'filter', delta = 3 WHERE module = 'urlfilter'"); + $ret[] = t('URL Filter module was disabled; this functionality has now been added to core.'); + } + + return $ret; +} + /** * @} End of "defgroup updates-4.7-to-x.x" * The next series of updates should start at 2000. |