diff options
| author | Dries Buytaert <dries@buytaert.net> | 2003-04-01 06:05:15 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2003-04-01 06:05:15 +0000 |
| commit | 3ad7449bc7a31917aaaf38da7e09d1131c05ddc1 (patch) | |
| tree | b3139b550851b12f1f7d0ee9c81a20afc618b225 /modules/aggregator | |
| parent | a92bfba70710b21b50d981c12537176d91722588 (diff) | |
| download | brdo-3ad7449bc7a31917aaaf38da7e09d1131c05ddc1.tar.gz brdo-3ad7449bc7a31917aaaf38da7e09d1131c05ddc1.tar.bz2 | |
- Various improvements to the menu system.
- Changed the import and taxonomy module to use better URLs. Patches by
Al.
- Fixed locale module weirdness. Patch by Kjartan.
Diffstat (limited to 'modules/aggregator')
| -rw-r--r-- | modules/aggregator/aggregator.module | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/modules/aggregator/aggregator.module b/modules/aggregator/aggregator.module index 826054967..938d47191 100644 --- a/modules/aggregator/aggregator.module +++ b/modules/aggregator/aggregator.module @@ -39,8 +39,8 @@ function import_link($type) { $help["bundles"] = "Bundles provide a generalized way of creating composite feeds. They allow you, for example, to combine various sport-related feeds into one bundle called <i>Sport</i>."; menu("admin/syndication", "content syndication", NULL, NULL, 5); menu("admin/syndication/news", "news aggregation", "import_admin", $help["general"]); - menu("admin/syndication/news/add feed", "add new feed", "import_admin", NULL, 2); - menu("admin/syndication/news/add bundle", "add new bundle", "import_admin", $help["bundles"], 3); + menu("admin/syndication/news/add/feed", "add new feed", "import_admin", NULL, 2); + menu("admin/syndication/news/add/bundle", "add new bundle", "import_admin", $help["bundles"], 3); menu("admin/syndication/news/tag", "tag news items", "import_admin", NULL, 4); menu("admin/syndication/news/help", "help", "import_help", NULL, 9); } @@ -489,12 +489,13 @@ function import_admin() { } switch ($op) { - case "add feed": - print import_form_feed(); - break; - case "add bundle": - print import_form_bundle(); - break; + case "add": + if (arg(4) == "bundle") { + print import_form_bundle(); + } + else { + print import_form_feed(); + } case "edit": if (arg(4) == "bundle") { print import_form_bundle(import_get_bundle(arg(5))); @@ -522,7 +523,7 @@ function import_admin() { $edit["title"] = 0; // fall through: case "Submit": - if (arg(3) == "add bundle") { + if (arg(4) == "bundle") { print status(import_save_bundle($edit)); } else { |