diff options
-rw-r--r-- | database/database.mysql | 11 | ||||
-rw-r--r-- | database/database.pgsql | 13 | ||||
-rw-r--r-- | includes/menu.inc | 1 | ||||
-rw-r--r-- | modules/node.module | 4 | ||||
-rw-r--r-- | modules/node/node.module | 4 | ||||
-rw-r--r-- | modules/taxonomy.module | 9 | ||||
-rw-r--r-- | modules/taxonomy/taxonomy.module | 9 |
7 files changed, 1 insertions, 50 deletions
diff --git a/database/database.mysql b/database/database.mysql index 244e7d405..7c14bdfd1 100644 --- a/database/database.mysql +++ b/database/database.mysql @@ -433,17 +433,6 @@ CREATE TABLE node_access ( ) TYPE=MyISAM; -- --- Table structure for table 'page' --- - -CREATE TABLE page ( - nid int(10) unsigned NOT NULL default '0', - link varchar(128) NOT NULL default '', - description varchar(128) NOT NULL default '', - PRIMARY KEY (nid) -) TYPE=MyISAM; - --- -- Table structure for table 'profile_fields' -- diff --git a/database/database.pgsql b/database/database.pgsql index 2d2d8653e..d22e9209c 100644 --- a/database/database.pgsql +++ b/database/database.pgsql @@ -450,19 +450,6 @@ CREATE INDEX node_counter_daycount_idx ON node_counter(daycount); CREATE INDEX node_counter_timestamp_idx ON node_counter(timestamp); -- --- Table structure for page --- - -CREATE TABLE page ( - nid integer NOT NULL default '0', - link varchar(128) NOT NULL default '', - format smallint NOT NULL default '0', - description varchar(128) NOT NULL default '', - PRIMARY KEY (nid) -); -CREATE INDEX page_nid_idx ON page(nid); - --- -- Table structure for table 'url_alias' -- diff --git a/includes/menu.inc b/includes/menu.inc index 1a3a0f9bf..cfee5b6cd 100644 --- a/includes/menu.inc +++ b/includes/menu.inc @@ -349,6 +349,7 @@ function menu_execute_active_handler() { if (strlen($arg)) { $arguments = array_merge($arguments, explode('/', $arg)); } + call_user_func_array($menu['items'][$mid]['callback'], $arguments); return MENU_FOUND; } diff --git a/modules/node.module b/modules/node.module index 008de3dd4..096d194a6 100644 --- a/modules/node.module +++ b/modules/node.module @@ -457,10 +457,6 @@ function node_save($node) { } } - $keysfmt = implode(', ', $s); - // We need to quote the placeholders for the values. - $valsfmt = "'". implode("', '", $s) ."'"; - // Insert the node into the database: db_query("INSERT INTO {node} (". implode(", ", $k) .") VALUES(". implode(", ", $s) .")", $v); diff --git a/modules/node/node.module b/modules/node/node.module index 008de3dd4..096d194a6 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -457,10 +457,6 @@ function node_save($node) { } } - $keysfmt = implode(', ', $s); - // We need to quote the placeholders for the values. - $valsfmt = "'". implode("', '", $s) ."'"; - // Insert the node into the database: db_query("INSERT INTO {node} (". implode(", ", $k) .") VALUES(". implode(", ", $s) .")", $v); diff --git a/modules/taxonomy.module b/modules/taxonomy.module index 1bd57ec11..ea802def7 100644 --- a/modules/taxonomy.module +++ b/modules/taxonomy.module @@ -473,15 +473,6 @@ function taxonomy_node_form($type, $node = '', $help = NULL, $name = 'taxonomy') } /** - * Determine whether a node mentions the name of a term. - */ -function taxonomy_node_has_term($nid, $tid) { - $term_name = db_result(db_query('SELECT name FROM {term_data} WHERE tid = %d', $tid)); - - return db_result(db_query("SELECT COUNT(n.nid) FROM {node} n WHERE n.nid = %d AND ((n.title LIKE '%%%s%%') OR (n.body LIKE '%%%s%%'))", $nid, $term_name, $term_name)); -} - -/** * Find all terms associated to the given node, within one vocabulary. */ function taxonomy_node_get_terms_by_vocabulary($nid, $vid, $key = 'tid') { diff --git a/modules/taxonomy/taxonomy.module b/modules/taxonomy/taxonomy.module index 1bd57ec11..ea802def7 100644 --- a/modules/taxonomy/taxonomy.module +++ b/modules/taxonomy/taxonomy.module @@ -473,15 +473,6 @@ function taxonomy_node_form($type, $node = '', $help = NULL, $name = 'taxonomy') } /** - * Determine whether a node mentions the name of a term. - */ -function taxonomy_node_has_term($nid, $tid) { - $term_name = db_result(db_query('SELECT name FROM {term_data} WHERE tid = %d', $tid)); - - return db_result(db_query("SELECT COUNT(n.nid) FROM {node} n WHERE n.nid = %d AND ((n.title LIKE '%%%s%%') OR (n.body LIKE '%%%s%%'))", $nid, $term_name, $term_name)); -} - -/** * Find all terms associated to the given node, within one vocabulary. */ function taxonomy_node_get_terms_by_vocabulary($nid, $vid, $key = 'tid') { |