summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Barth2010-09-17 23:00:19 +0000
committerAlex Barth2010-09-17 23:00:19 +0000
commit72598911344544f4ffd37f238d58ad3303bb53f8 (patch)
tree98722cff0a17d308fa7174732a6ac32be4031964
parent3f7861150b7cc9e54bf7fe230e6c982b335ee9f5 (diff)
Convert form callbacks, some theme function updates.
-rw-r--r--feeds.pages.inc2
-rw-r--r--feeds_ui/feeds_ui.admin.inc18
-rw-r--r--includes/FeedsConfigurable.inc2
3 files changed, 12 insertions, 10 deletions
diff --git a/feeds.pages.inc b/feeds.pages.inc
index 7144253..424de6b 100644
--- a/feeds.pages.inc
+++ b/feeds.pages.inc
@@ -117,7 +117,7 @@ function feeds_import_tab_form_submit($form, &$form_state) {
* Used on both node pages and configuration pages.
* Therefore $node may be missing.
*/
-function feeds_delete_tab_form(&$form_state, $importer_id, $node = NULL) {
+function feeds_delete_tab_form($form, &$form_state, $importer_id, $node = NULL) {
if (empty($node)) {
$form['#redirect'] = 'import/'. $importer_id;
}
diff --git a/feeds_ui/feeds_ui.admin.inc b/feeds_ui/feeds_ui.admin.inc
index 50b4744..9ea7cae 100644
--- a/feeds_ui/feeds_ui.admin.inc
+++ b/feeds_ui/feeds_ui.admin.inc
@@ -49,7 +49,7 @@ function feeds_ui_mapping_help() {
/**
* Build overview of available configurations.
*/
-function feeds_ui_overview_form(&$form_status) {
+function feeds_ui_overview_form($form, &$form_status) {
$form = $form['enabled'] = $form['disabled'] = array();
$form['#header'] = array(
@@ -150,7 +150,7 @@ function feeds_ui_overview_form_submit($form, &$form_state) {
* FeedsImporter object. If given, form will create a new importer as a copy
* of $from_importer.
*/
-function feeds_ui_create_form(&$form_state, $from_importer = NULL) {
+function feeds_ui_create_form($form, &$form_state, $from_importer = NULL) {
drupal_add_js(drupal_get_path('module', 'feeds_ui') .'/feeds_ui.js');
$form = array();
$form['#from_importer'] = $from_importer;
@@ -222,7 +222,7 @@ function feeds_ui_create_form_submit($form, &$form_state) {
/**
* Delete configuration form.
*/
-function feeds_ui_delete_form(&$form_state, $importer) {
+function feeds_ui_delete_form($form, &$form_state, $importer) {
$form['#redirect'] = 'admin/build/feeds';
$form['#importer'] = $importer;
if ($importer->export_type & EXPORT_IN_CODE) {
@@ -255,7 +255,7 @@ function feeds_ui_delete_form_submit($form, &$form_state) {
/**
* Export a feed configuration.
*/
-function feeds_ui_export_form(&$form_state, $importer) {
+function feeds_ui_export_form($form, &$form_state, $importer) {
$code = feeds_export($importer->id);
$form['export'] = array(
@@ -413,7 +413,7 @@ function feeds_ui_edit_page($importer, $active = 'help', $plugin_key = '') {
* @return
* A Form API form definition.
*/
-function feeds_ui_plugin_form(&$form_state, $importer, $type) {
+function feeds_ui_plugin_form($form, &$form_state, $importer, $type) {
$plugins = feeds_get_plugins_by_type($type);
$form = array();
@@ -451,7 +451,8 @@ function feeds_ui_plugin_form_submit($form, &$form_state) {
/**
* Theme feeds_ui_plugin_form().
*/
-function theme_feeds_ui_plugin_form($form) {
+function theme_feeds_ui_plugin_form($variables) {
+ $form = $variables['form'];
drupal_add_js(drupal_get_path('module', 'feeds_ui') .'/feeds_ui.js');
$output = '';
@@ -481,7 +482,7 @@ function theme_feeds_ui_plugin_form($form) {
* shared form of configuration, most of the common functionality can live in
* FeedsProcessor, a flag can tell whether mapping is supported or not.
*/
-function feeds_ui_mapping_form(&$form_state, $importer) {
+function feeds_ui_mapping_form($form, &$form_state, $importer) {
drupal_add_js(drupal_get_path('module', 'feeds_ui') .'/feeds_ui.js');
$form = array();
@@ -766,7 +767,8 @@ function theme_feeds_ui_container($variables) {
/**
* Theme function for feeds_ui_mapping_form().
*/
-function theme_feeds_ui_mapping_form($form) {
+function theme_feeds_ui_mapping_form($variables) {
+ $form = $variables['form'];
// Build the actual mapping table.
$header = array(
diff --git a/includes/FeedsConfigurable.inc b/includes/FeedsConfigurable.inc
index e151697..e9e21b8 100644
--- a/includes/FeedsConfigurable.inc
+++ b/includes/FeedsConfigurable.inc
@@ -227,7 +227,7 @@ function feeds_get_form($configurable, $form_method) {
* @param $form_method
* The $form_method that should be rendered.
*/
-function feeds_form(&$form_state, $configurable, $form_method) {
+function feeds_form($form, &$form_state, $configurable, $form_method) {
$form = $configurable->$form_method($form_state);
$form['#configurable'] = $configurable;
$form['#feeds_form_method'] = $form_method;