The branch, master has been updated via b34b104a3061d315eec6ce540cae5e43e5190f34 (commit) from cc9f99d303d2103775dcd44094351fbc9b33242e (commit)

- Log ----------------------------------------------------------------- commit b34b104a3061d315eec6ce540cae5e43e5190f34 Author: Marc Delisle marc@infomarc.info Date: Wed Jan 12 08:53:06 2011 -0500

Improve function naming and remove vulgar term

-----------------------------------------------------------------------

Summary of changes: libraries/schema/User_Schema.class.php | 8 ++++---- schema_edit.php | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/libraries/schema/User_Schema.class.php b/libraries/schema/User_Schema.class.php index bcb92da..fbec138 100644 --- a/libraries/schema/User_Schema.class.php +++ b/libraries/schema/User_Schema.class.php @@ -40,7 +40,7 @@ class PMA_User_Schema * @access public */

- public function processUserPreferences() + public function processUserChoice() { global $action_choose,$db,$cfgRelation,$cfg,$query_default_option;

@@ -65,7 +65,7 @@ class PMA_User_Schema $this->c_table_rows = $_POST['c_table_rows']; $this->_editCoordinates($db, $cfgRelation,$query_default_option); break; - case 'deleteCrap': + case 'delete_old_references': $this->_deleteTableRows($delrow,$cfgRelation,$db,$this->chosenPage); break; case 'process_export': @@ -84,7 +84,7 @@ class PMA_User_Schema * @return void * @access public */ - public function createPage($db) + public function showCreatePageDialog($db) { ?> <form method="post" action="schema_edit.php" name="frm_create_page"> @@ -439,7 +439,7 @@ class PMA_User_Schema if ($shoot) { echo '<form action="schema_edit.php" method="post">' . "\n" . PMA_generate_common_hidden_inputs($db, $table) - . '<input type="hidden" name="do" value="deleteCrap" />' . "\n" + . '<input type="hidden" name="do" value="delete_old_references" />' . "\n" . '<input type="hidden" name="chpage" value="' . htmlspecialchars($chpage) . '" />' . "\n" . __('The current page has references to tables that no longer exist. Would you like to delete those references?') . '<ul>' . "\n" diff --git a/schema_edit.php b/schema_edit.php index bf97b24..a5d3a38 100644 --- a/schema_edit.php +++ b/schema_edit.php @@ -85,7 +85,7 @@ if ($cfgRelation['pdfwork']) { */ if(isset($_REQUEST['do'])){ $user_schema->setAction($_REQUEST['do']); - $user_schema->processUserPreferences(); + $user_schema->processUserChoice(); }

/** @@ -99,7 +99,7 @@ if ($cfgRelation['pdfwork']) { * Create a new page where relations will be drawn */

- $user_schema->createPage($db); + $user_schema->showCreatePageDialog($db);

/** * After selection of page or creating a page

hooks/post-receive