Merge branch 'QA_4_3'

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
phpmyadmin · Nov 27, 2014 · 6fb9a53 · 6fb9a53
2 parents bf4a032 + 10b958c
commit 6fb9a53
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -78,6 +78,7 @@ phpMyAdmin - ChangeLog
 - bug #4605 Unseen messages in tracking
 - bug #4606 Tracking report export as SQL dump does not work
 - bug #4607 Syntax error during db_copy operation
+- bug #4608 SELECT permission issues with relations and restricted access
 
 4.2.12.0 (2014-11-20)
 - bug #4574 Blank/white page when JavaScript disabled

diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php
@@ -1294,7 +1294,7 @@ function PMA_getForeignData(
                 }
             }
 
-            $disp  = $GLOBALS['dbi']->query(
+            $disp  = $GLOBALS['dbi']->tryQuery(
                 $f_query_main . $f_query_from . $f_query_filter
                 . $f_query_order . $f_query_limit
             );
@@ -1308,6 +1308,12 @@ function PMA_getForeignData(
                     $disp_row[] = $single_disp_row;
                 }
                 @$GLOBALS['dbi']->freeResult($disp);
+            } else {
+                // Either no data in the foreign table or
+                // user does not have select permission to foreign table/field
+                // Show an input field with a 'Browse foreign values' link
+                $disp_row = null;
+                $foreign_link = true;
             }
         } else {
             $disp_row = null;