diff --git a/modules/simpletest/tests/upgrade/drupal-6.menu.database.php b/modules/simpletest/tests/upgrade/drupal-6.menu.database.php index 7fae337..8962615 100644 --- a/modules/simpletest/tests/upgrade/drupal-6.menu.database.php +++ b/modules/simpletest/tests/upgrade/drupal-6.menu.database.php @@ -126,33 +126,6 @@ db_insert('menu_links')->fields(array( 'p9' => '0', 'updated' => '0', )) -->values(array( - 'menu_name' => 'secondary-links', - 'mlid' => '206', - 'plid' => '0', - 'link_path' => 'node', - 'router_path' => 'node', - 'link_title' => 'node-page-with-query', - 'options' => 'a:2:{s:5:"query";s:14:"page=1&node=10";s:10:"attributes";a:1:{s:5:"title";s:0:"";}}', - 'module' => 'menu', - 'hidden' => '0', - 'external' => '0', - 'has_children' => '0', - 'expanded' => '0', - 'weight' => '2', - 'depth' => '1', - 'customized' => '1', - 'p1' => '206', - 'p2' => '0', - 'p3' => '0', - 'p4' => '0', - 'p5' => '0', - 'p6' => '0', - 'p7' => '0', - 'p8' => '0', - 'p9' => '0', - 'updated' => '0', -)) ->execute(); db_insert('blocks')->fields(array( 'bid', diff --git a/modules/system/system.install b/modules/system/system.install index 6d81420..1161d6c 100644 --- a/modules/system/system.install +++ b/modules/system/system.install @@ -3016,24 +3016,12 @@ function system_update_7073() { } /** - * Convert menu_links query strings to arrays. + * This update has been removed and will not run. */ function system_update_7074() { - $query = db_select('menu_links', 'ml', array('fetch' => PDO::FETCH_ASSOC)) - ->fields('ml', array('mlid', 'options')) - ->condition('options', '%query%', 'LIKE'); - foreach ($query->execute() as $menu_link) { - $menu_link['options'] = unserialize($menu_link['options']); - if (isset($menu_link['options']['query']) && is_string($menu_link['options']['query'])) { - $menu_link['options']['query'] = drupal_get_query_array($menu_link['options']['query']); - db_update('menu_links') - ->fields(array( - 'options' => serialize($menu_link['options']), - )) - ->condition('mlid', $menu_link['mlid'], '=') - ->execute(); - } - } + // This update function previously converted menu_links query strings to + // arrays. It has been removed for now due to incompatibility with + // PostgreSQL. } /**