Update paths, convert ctools_static().

feeds.module

@@ -640,7 +640,7 @@ function feeds_get_importer_id($content_type) {
  * Helper function for feeds_get_importer_id() and feeds_enabled_importers().
  */
 function _feeds_importer_digest() {
-  $importers = &ctools_static(__FUNCTION__);
+  $importers = &drupal_static(__FUNCTION__);
   if ($importers === NULL) {
     if ($cache = cache_get(__FUNCTION__)) {
       $importers = $cache->data;
@@ -661,7 +661,7 @@ function _feeds_importer_digest() {
  */
 function feeds_cache_clear($rebuild_menu = TRUE) {
   cache_clear_all('_feeds_importer_digest', 'cache');
-  ctools_static_reset('_feeds_importer_digest');
+  drupal_static_reset('_feeds_importer_digest');
   ctools_include('export');
   ctools_export_load_object_reset('feeds_importer');
   drupal_static_reset('_node_types_build');

feeds_ui/feeds_ui.module

@@ -9,12 +9,9 @@
  */
 function feeds_ui_help($path, $arg) {
   switch ($path) {
-    case 'admin/build/feeds':
+    case 'admin/structure/feeds':
       $output = '<p>'. t('Create one or more Feed importers for pulling content into Drupal. You can use these importers from the !import page or - if you attach them to a content type - simply by creating a node from that content type.', array('!import' => l(t('Import'), 'import'))) .'</p>';
       return $output;
-    case 'admin/content/feeds':
-      $output = '<p>'. t('Import content into Drupal.') .'</p>';
-      return $output;
   }
 }
 
@@ -23,19 +20,19 @@ function feeds_ui_help($path, $arg) {
  */
 function feeds_ui_menu() {
   $items = array();
-  $items['admin/build/feeds'] = array(
-    'title' => 'Feed importers',
-    'description' => 'Configure feeds to import or aggregate RSS and Atom feeds, import CSV files or more.',
+  $items['admin/structure/import'] = array(
+    'title' => 'Feeds',
+    'description' => 'Configure one or more Feeds importers to aggregate RSS and Atom feeds, import CSV files or more.',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('feeds_ui_overview_form'),
     'access arguments' => array('administer feeds'),
     'file' => 'feeds_ui.admin.inc',
   );
-  $items['admin/build/feeds/list'] = array(
+  $items['admin/structure/feeds/list'] = array(
     'title' => t('List'),
     'type' => MENU_DEFAULT_LOCAL_TASK,
   );
-  $items['admin/build/feeds/create'] = array(
+  $items['admin/structure/feeds/create'] = array(
     'title' => t('New importer'),
     'page callback' => 'drupal_get_form',
     'page arguments' => array('feeds_ui_create_form'),
@@ -44,7 +41,7 @@ function feeds_ui_menu() {
     'type' => MENU_LOCAL_TASK,
     'weight' => 1,
   );
-  $items['admin/build/feeds/clone/%feeds_importer'] = array(
+  $items['admin/structure/feeds/clone/%feeds_importer'] = array(
     'title callback' => 'feed_ui_clone_title',
     'title arguments' => array(4),
     'page callback' => 'drupal_get_form',
@@ -53,7 +50,7 @@ function feeds_ui_menu() {
     'file' => 'feeds_ui.admin.inc',
     'type' => MENU_CALLBACK,
   );
-  $items['admin/build/feeds/export/%feeds_importer'] = array(
+  $items['admin/structure/feeds/export/%feeds_importer'] = array(
     'title callback' => 'feed_ui_title',
     'title arguments' => array(4),
     'page callback' => 'drupal_get_form',
@@ -62,7 +59,7 @@ function feeds_ui_menu() {
     'file' => 'feeds_ui.admin.inc',
     'type' => MENU_CALLBACK,
   );
-  $items['admin/build/feeds/edit/%feeds_importer'] = array(
+  $items['admin/structure/feeds/edit/%feeds_importer'] = array(
     'title callback' => 'feed_ui_title',
     'title arguments' => array(4),
     'page callback' => 'feeds_ui_edit_page',
@@ -71,7 +68,7 @@ function feeds_ui_menu() {
     'file' => 'feeds_ui.admin.inc',
     'type' => MENU_CALLBACK,
   );
-  $items['admin/build/feeds/delete/%feeds_importer'] = array(
+  $items['admin/structure/feeds/delete/%feeds_importer'] = array(
     'title' => t('Delete configuration'),
     'page callback' => 'drupal_get_form',
     'page arguments' => array('feeds_ui_delete_form', 4),