[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_5_0ALPHA1-11-g0b70c27

[Marc Delisle]

The branch, master has been updated
       via  0b70c272b4db3abe290ca72d6805c56caf751a03 (commit)
      from  02fb282694b9d4e18915b95c93ec27f50db7f048 (commit)


- Log -----------------------------------------------------------------
commit 0b70c272b4db3abe290ca72d6805c56caf751a03
Author: Marc Delisle <marc at infomarc.info>
Date:   Sun Jan 8 08:21:20 2012 -0500

    Incorrect XHTML

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

Summary of changes:
 libraries/tbl_select.lib.php |   25 ++++++++-----------------
 1 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/libraries/tbl_select.lib.php b/libraries/tbl_select.lib.php
index 967f39c..b1108fa 100644
--- a/libraries/tbl_select.lib.php
+++ b/libraries/tbl_select.lib.php
@@ -152,27 +152,18 @@ function PMA_getForeignFields_Values($foreigners, $foreignData, $field, $tbl_fie
 
     } elseif ($foreignData['foreign_link'] == true) {
         if (isset($fields[$i]) && is_string($fields[$i])) {
-         $str .= '<input type="text" id="fieldID_' . $i .'"name="fields[' . $i . ']" value="' . $fields[$i] . '"';
-             'id="field_' . md5($field) . '[' . $i .']"
-             class="textfield"/>' ;
+            $str .= '<input type="text" id="fieldID_' . $i . '" name="fields[' . $i . ']" value="' . $fields[$i] . '" id="field_' . md5($field) . '[' . $i .']" class="textfield" />' ;
         } else {
-         $str .= '<input type="text" id="fieldID_' . $i .'"name="fields[' . $i . ']"';
-             'id="field_' . md5($field) . '[' . $i .']"
-             class="textfield" />' ;
+            $str .= '<input type="text" id="fieldID_' . $i . '" name="fields[' . $i . ']" id="field_' . md5($field) . '[' . $i .']" class="textfield" />' ;
         }
- ?>
-    <?php $str .= '<script type="text/javascript">';
-        // <![CDATA[
-    $str .=  <<<EOT
+        $str .=  <<<EOT
 <a target="_blank" onclick="window.open(this.href, 'foreigners', 'width=640,height=240,scrollbars=yes'); return false" href="browse_foreigners.php?
 EOT;
-    $str .= '' . PMA_generate_common_url($db, $table) .  '&field=' . urlencode($field) . '&fieldkey=' . $i . '"';
-    if ($in_zoom_search_edit) {
-        $str .= ' class="browse_foreign"';
-    }
-    $str .= '>' . str_replace("'", "\'", $titles['Browse']) . '</a>';
-        // ]]
-        $str .= '</script>';
+        $str .= '' . PMA_generate_common_url($db, $table) .  '&field=' . urlencode($field) . '&fieldkey=' . $i . '"';
+        if ($in_zoom_search_edit) {
+            $str .= ' class="browse_foreign"';
+        }
+        $str .= '>' . str_replace("'", "\'", $titles['Browse']) . '</a>';
 
     } elseif (in_array($tbl_fields_type[$i], PMA_getGISDatatypes())) {
         // g e o m e t r y


hooks/post-receive
-- 
phpMyAdmin