Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMadhura Jayaratne <madhura.cj@gmail.com>2015-05-18 07:58:57 +0300
committerMadhura Jayaratne <madhura.cj@gmail.com>2015-05-18 07:58:57 +0300
commit34f318e52d8f3fdb33b6d9a2fa49574b4809c89e (patch)
tree7e8cfdafd0d26380daec2fbf65dd20ab96206b91
parent95ac6b46dd4039f066d2552d141a6cdc3e6f89b8 (diff)
Allow accessing visual query builder when pmadb is not configured
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
-rw-r--r--ChangeLog1
-rw-r--r--db_qbe.php34
2 files changed, 17 insertions, 18 deletions
diff --git a/ChangeLog b/ChangeLog
index 5304dd84ed..3a2fc2bfc0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@ phpMyAdmin - ChangeLog
======================
4.4.8.0 (not yet released)
+- bug Allow accessing visual query builder when pmadb is not configured
4.4.7.0 (2015-05-16)
- bug #4876 Settings issues (Favorite tables shown twice in Settings)
diff --git a/db_qbe.php b/db_qbe.php
index 55df65dff9..f499efd348 100644
--- a/db_qbe.php
+++ b/db_qbe.php
@@ -108,26 +108,24 @@ unset($message_to_display);
// create new qbe search instance
$db_qbe = new PMA_DBQbe($GLOBALS['db'], $savedSearchList, $savedSearch);
+$url = 'db_designer.php' . PMA_URL_getCommon(
+ array_merge(
+ $url_params,
+ array('query' => 1)
+ )
+);
+$response->addHTML(
+ PMA_Message::notice(
+ sprintf(
+ __('Switch to %svisual builder%s'),
+ '<a href="' . $url . '">',
+ '</a>'
+ )
+ )
+);
+
/**
* Displays the Query by example form
*/
-if ($cfgRelation['pdfwork']) {
- $url = 'db_designer.php' . PMA_URL_getCommon(
- array_merge(
- $url_params,
- array('query' => 1)
- )
- );
- $response->addHTML(
- PMA_Message::notice(
- sprintf(
- __('Switch to %svisual builder%s'),
- '<a href="' . $url . '">',
- '</a>'
- )
- )
- );
-}
-
$response->addHTML($db_qbe->getSelectionForm());
?>