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:
authorChanaka Indrajith <pe.chanaka.ck@gmail.com>2012-06-27 20:23:59 +0400
committerChanaka Indrajith <pe.chanaka.ck@gmail.com>2012-06-27 20:23:59 +0400
commit39d37fafcce29160c4dfe6ef7696de19bebb1d18 (patch)
tree3f6b5030d805fb3d5ccbdcf10ab680e7cd12dffa /pmd_relation_new.php
parent1cc49d32d94d8981e427a32900dc61ae6ec90149 (diff)
parentf2057c47511c6b3c7d75b167c5abcaab1695675b (diff)
Resolved conflicts
Diffstat (limited to 'pmd_relation_new.php')
-rw-r--r--pmd_relation_new.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/pmd_relation_new.php b/pmd_relation_new.php
index d188e81a70..bb8cb8b1cd 100644
--- a/pmd_relation_new.php
+++ b/pmd_relation_new.php
@@ -97,7 +97,7 @@ if ($common_functions->isForeignKeySupported($type_T1)
. '\'' . $common_functions->sqlAddSlashes($T1) . '\','
. '\'' . $common_functions->sqlAddSlashes($F1) . '\')';
- if (PMA_query_as_controluser($q, false, PMA_DBI_QUERY_STORE)) {
+ if (PMA_queryAsControlUser($q, false, PMA_DBI_QUERY_STORE)) {
PMD_return_new(1, __('Internal relation added'));
} else {
PMD_return_new(0, __('Error: Relation not added.'));