Merge remote-tracking branch 'origin/master'

phpmyadmin · Oct 28, 2012 · d234176 · d234176
2 parents 50d9f9d + 971cd6e
commit d234176
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/db_datadict.php b/db_datadict.php
@@ -45,10 +45,8 @@
      * Displays DB comment
      */
     if ($comment) {
-        ?>
-    <p> <?php echo __('Database comment: '); ?>
-        <i><?php echo htmlspecialchars($comment); ?></i></p>
-        <?php
+        echo '<p>' . __('Database comment: ')
+            . '<i>' . htmlspecialchars($comment) . '</i></p>';
     } // end if
 }
 

diff --git a/tbl_relation.php b/tbl_relation.php
@@ -69,7 +69,7 @@
  *
  * @access  public
  */
-function PMA_generate_dropdown(
+function PMA_generateDropdown(
     $dropdown_question, $select_name, $choices, $selected_value
 ) {
     echo htmlspecialchars($dropdown_question) . '&nbsp;&nbsp;';
@@ -95,7 +95,7 @@ function PMA_generate_dropdown(
  *
  * @access  public
  */
-function PMA_backquote_split($text)
+function PMA_backquoteSplit($text)
 {
     $elements = array();
     $final_pos = strlen($text) - 1;
@@ -204,7 +204,7 @@ function PMA_backquote_split($text)
         $master_field = $multi_edit_columns_name[$master_field_md5];
 
         if (! empty($foreign_string)) {
-            list($foreign_db, $foreign_table, $foreign_field) = PMA_backquote_split($foreign_string);
+            list($foreign_db, $foreign_table, $foreign_field) = PMA_backquoteSplit($foreign_string);
             if (! isset($existrel_foreign[$master_field])) {
                 // no key defined for this field
 
@@ -523,7 +523,7 @@ function PMA_backquote_split($text)
                 // won't display the clause if it's set as RESTRICT.
                 $on_delete = isset($existrel_foreign[$myfield]['on_delete'])
                     ? $existrel_foreign[$myfield]['on_delete'] : 'RESTRICT';
-                PMA_generate_dropdown(
+                PMA_generateDropdown(
                     'ON DELETE',
                     'on_delete[' . $myfield_md5 . ']',
                     $options_array,
@@ -534,7 +534,7 @@ function PMA_backquote_split($text)
                 echo '<span class="formelement">' . "\n";
                 $on_update = isset($existrel_foreign[$myfield]['on_update'])
                     ? $existrel_foreign[$myfield]['on_update'] : 'RESTRICT';
-                PMA_generate_dropdown(
+                PMA_generateDropdown(
                     'ON UPDATE',
                     'on_update[' . $myfield_md5 . ']',
                     $options_array,