diff options
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/database/pgsql/database.inc | 1 | ||||
| -rw-r--r-- | includes/database/query.inc | 2 | ||||
| -rw-r--r-- | includes/database/select.inc | 7 | ||||
| -rw-r--r-- | includes/menu.inc | 5 |
4 files changed, 2 insertions, 13 deletions
diff --git a/includes/database/pgsql/database.inc b/includes/database/pgsql/database.inc index f6ce65051..85a8e8315 100644 --- a/includes/database/pgsql/database.inc +++ b/includes/database/pgsql/database.inc @@ -14,7 +14,6 @@ class DatabaseConnection_pgsql extends DatabaseConnection { protected $transactionSupport; - //protected $lastInsertInfo = NULL; public function __construct(Array $connection_options = array()) { diff --git a/includes/database/query.inc b/includes/database/query.inc index 458c87d24..9c7fdfcf4 100644 --- a/includes/database/query.inc +++ b/includes/database/query.inc @@ -630,7 +630,7 @@ class MergeQuery extends Query { // this method with database-specific logic, so this function serves only // as a fallback to aid developers of new drivers. - //Wrap multiple queries in a transaction, if the database supports it. + // Wrap multiple queries in a transaction, if the database supports it. $transaction = $this->connection->startTransaction(); // Manually check if the record already exists. diff --git a/includes/database/select.inc b/includes/database/select.inc index 7aa45006b..3d1074773 100644 --- a/includes/database/select.inc +++ b/includes/database/select.inc @@ -44,13 +44,6 @@ class SelectQuery extends Query implements QueryConditionInterface, QueryAlterab protected $tables = array(); /** - * The values to insert into the prepared statement of this query. - * - * @var array - */ - //protected $arguments = array(); - - /** * The fields by which to order this query. * * This is an associative array. The keys are the fields to order, and the value diff --git a/includes/menu.inc b/includes/menu.inc index 3da6494f3..c112028b2 100644 --- a/includes/menu.inc +++ b/includes/menu.inc @@ -2211,10 +2211,8 @@ function _menu_link_move_children($item, $existing_item) { function _menu_update_parental_status($item, $exclude = FALSE) { // If plid == 0, there is nothing to update. if ($item['plid']) { - // We may want to exclude the passed link as a possible child. - //$where = $exclude ? " AND mlid != %d" : ''; // Check if at least one visible child exists in the table. - $query = db_select('menu_links', 'm'); + $query = db_select('menu_links', 'm'); $query->addField('m', 'mlid'); $query->condition('menu_name', $item['menu_name']); $query->condition('plid', $item['plid']); @@ -2225,7 +2223,6 @@ function _menu_update_parental_status($item, $exclude = FALSE) { } $parent_has_children = ((bool) $query->execute()->fetchField()) ? 1 : 0; - //$parent_has_children = (bool)db_result(db_query_range("SELECT mlid FROM {menu_links} WHERE menu_name = '%s' AND plid = %d AND hidden = 0" . $where, $item['menu_name'], $item['plid'], $item['mlid'], 0, 1)); db_query("UPDATE {menu_links} SET has_children = %d WHERE mlid = %d", $parent_has_children, $item['plid']); } |