Commit 5f8027f9 authored by Dries's avatar Dries

- Patch #83397 by edkwh: -> . Getting rid of super-globals.

parent cb8201c3
......@@ -344,7 +344,7 @@ function aggregator_form_category($edit = array()) {
* Validate aggregator_form_feed form submissions.
*/
function aggregator_form_category_validate($form_id, $form_values) {
if ($_POST['op'] == t('Submit')) {
if ($form_values['op'] == t('Submit')) {
// Check for duplicate titles
if (isset($form_values['cid'])) {
$category = db_fetch_object(db_query("SELECT cid FROM {aggregator_category} WHERE title = '%s' AND cid != %d", $form_values['title'], $form_values['cid']));
......@@ -363,7 +363,7 @@ function aggregator_form_category_validate($form_id, $form_values) {
* @todo Add delete confirmation dialog.
*/
function aggregator_form_category_submit($form_id, $form_values) {
if ($_POST['op'] == t('Delete')) {
if ($form_values['op'] == t('Delete')) {
$title = $form_values['title'];
// Unset the title:
unset($form_values['title']);
......@@ -475,7 +475,7 @@ function aggregator_form_feed($edit = array()) {
* Validate aggregator_form_feed form submissions.
*/
function aggregator_form_feed_validate($form_id, $form_values) {
if ($_POST['op'] == t('Submit')) {
if ($form_values['op'] == t('Submit')) {
// Check for duplicate titles
if (isset($form_values['fid'])) {
$result = db_query("SELECT title, url FROM {aggregator_feed} WHERE (title = '%s' OR url='%s') AND fid != %d", $form_values['title'], $form_values['url'], $form_values['fid']);
......@@ -499,7 +499,7 @@ function aggregator_form_feed_validate($form_id, $form_values) {
* @todo Add delete confirmation dialog.
*/
function aggregator_form_feed_submit($form_id, $form_values) {
if ($_POST['op'] == t('Delete')) {
if ($form_values['op'] == t('Delete')) {
$title = $form_values['title'];
// Unset the title:
unset($form_values['title']);
......
......@@ -332,7 +332,7 @@ function book_outline($nid) {
* Handles book outline form submissions.
*/
function book_outline_submit($form_id, $form_values) {
$op = $_POST['op'];
$op = $form_values['op'];
$node = node_load($form_values['nid']);
switch ($op) {
......
......@@ -200,7 +200,7 @@ function search_menu($may_cache) {
* Validate callback.
*/
function search_admin_settings_validate($form_id, $form_values) {
if ($_POST['op'] == t('Re-index site')) {
if ($form_values['op'] == t('Re-index site')) {
drupal_goto('admin/settings/search/wipe');
}
// If these settings change, the index needs to be rebuilt.
......
......@@ -1106,7 +1106,7 @@ function system_theme_settings_submit($form_id, $form_values) {
*
*/
function system_settings_form_submit($form_id, $form_values) {
$op = isset($_POST['op']) ? $_POST['op'] : '';
$op = isset($form_values['op']) ? $form_values['op'] : '';
// Exclude unnecessary elements.
unset($form_values['submit'], $form_values['reset'], $form_values['form_id']);
......@@ -1191,7 +1191,7 @@ function system_themes_submit($form_id, $form_values) {
db_query("UPDATE {system} SET status = 0 WHERE type = 'theme'");
if ($_POST['op'] == t('Save configuration')) {
if ($form_values['op'] == t('Save configuration')) {
if (is_array($form_values['status'])) {
foreach ($form_values['status'] as $key => $choice) {
// Always enable the default theme, despite its status checkbox being checked:
......
......@@ -2552,7 +2552,7 @@ function theme_user_filters($form) {
* Process result from user administration filter form.
*/
function user_filter_form_submit($form_id, $form_values) {
$op = $_POST['op'];
$op = $form_values['op'];
$filters = user_filters();
switch ($op) {
case t('Filter'): case t('Refine'):
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment