Distinguish no column order in fieldName

git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@955 7c3ca157-0c34-0410-bff1-cbf682f78f5c

diff --git a/adminer/select.inc.php b/adminer/select.inc.php
index 8e1ab2eefefc18af9ec08787ae4529a4df0c371b..b0e82632cee4e4110f11234b7b5734774a8813a4 100644 (file)
--- a/adminer/select.inc.php
+++ b/adminer/select.inc.php
@@ -183,7 +183,7 @@ if (!$columns) {
                        echo "<thead><tr><td><input type='checkbox' id='all-page' onclick='form_check(this, /check/);'>";
                        $names = array();
                        reset($select);
-                       $order = 0;
+                       $order = 1;
                        foreach ($rows[0] as $key => $val) {
                                $val = $_GET["columns"][key($select)];
                                $field = $fields[$select ? $val["col"] : $key];

diff --git a/editor/example.php b/editor/example.php
index 1a8b518e4f2c7f719ca350c96faef7edf26900ca..e15807d83c17e19e9d60ae01b30bc234f2449282 100644 (file)
--- a/editor/example.php
+++ b/editor/example.php
@@ -29,8 +29,8 @@ function adminer_object() {
                }
                
                function fieldName($field, $order = 0) {
-                       // only first five columns with comments will be displayed
-                       return ($order < 5 ? h($field["comment"]) : "");
+                       // only columns with comments will be displayed and only the first five in select
+                       return ($order <= 5 ? h($field["comment"]) : "");
                }
                
        }