The branch, master has been updated
via b40fdde6e811631a44622fe5bad851febe449079 (commit)
from 97b54f4ff4990e35bbb9ac61b6c57c881748479e (commit)
- Log -----------------------------------------------------------------
commit b40fdde6e811631a44622fe5bad851febe449079
Author: Michal Čihař <[email protected]>
Date: Thu Jul 21 11:08:44 2011 +0200
Revert "Avoid double underscore in function name"
This reverts commit c29c0e0eb5039645730d4a9f4deb07ea0af1337d.
Oops, this is actually needed.
-----------------------------------------------------------------------
Summary of changes:
libraries/relation.lib.php | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php
index 273952d..c2acd8e 100644
--- a/libraries/relation.lib.php
+++ b/libraries/relation.lib.php
@@ -48,7 +48,7 @@ function PMA_query_as_controluser($sql, $show_error = true,
$options = 0)
function PMA_getRelationsParam($verbose = false)
{
if (empty($_SESSION['relation'][$GLOBALS['server']])) {
- $_SESSION['relation'][$GLOBALS['server']] = PMA_getRelationsParam();
+ $_SESSION['relation'][$GLOBALS['server']] = PMA__getRelationsParam();
}
// just for BC but needs to be before PMA_printRelationsParamDiagnostic()
@@ -196,7 +196,7 @@ function PMA_printDiagMessageForParameter($parameter,
$relation_parameter_set, $
* @access protected
* @return array the relation parameters for the current user
*/
-function PMA_getRelationsParam()
+function PMA__getRelationsParam()
{
$cfgRelation = array();
$cfgRelation['relwork'] = false;
@@ -277,7 +277,7 @@ function PMA_getRelationsParam()
$cfgRelation['displaywork'] = true;
}
}
-
+
if (isset($cfgRelation['table_coords']) &&
isset($cfgRelation['pdf_pages'])) {
$cfgRelation['pdfwork'] = true;
}
@@ -766,7 +766,7 @@ function PMA_purgeHistory($username)
*
* @access protected
*/
-function PMA_foreignDropdownBuild($foreign, $data, $mode)
+function PMA__foreignDropdownBuild($foreign, $data, $mode)
{
$reloptions = array();
@@ -816,7 +816,7 @@ function PMA_foreignDropdownBuild($foreign, $data, $mode)
} // end foreach
return $reloptions;
-} // end of 'PMA_foreignDropdownBuild' function
+} // end of 'PMA__foreignDropdownBuild' function
/**
* Outputs dropdown with values of foreign fields
@@ -857,19 +857,19 @@ function PMA_foreignDropdown($disp_row, $foreign_field,
$foreign_display, $data,
if ($foreign_display) {
if (PMA_isValid($GLOBALS['cfg']['ForeignKeyDropdownOrder'], 'array')) {
if (PMA_isValid($GLOBALS['cfg']['ForeignKeyDropdownOrder'][0])) {
- $top = PMA_foreignDropdownBuild($foreign, $data,
+ $top = PMA__foreignDropdownBuild($foreign, $data,
$GLOBALS['cfg']['ForeignKeyDropdownOrder'][0]);
}
if (PMA_isValid($GLOBALS['cfg']['ForeignKeyDropdownOrder'][1])) {
- $bottom = PMA_foreignDropdownBuild($foreign, $data,
+ $bottom = PMA__foreignDropdownBuild($foreign, $data,
$GLOBALS['cfg']['ForeignKeyDropdownOrder'][1]);
}
} else {
- $top = PMA_foreignDropdownBuild($foreign, $data, 'id-content');
- $bottom = PMA_foreignDropdownBuild($foreign, $data, 'content-id');
+ $top = PMA__foreignDropdownBuild($foreign, $data, 'id-content');
+ $bottom = PMA__foreignDropdownBuild($foreign, $data, 'content-id');
}
} else {
- $top = PMA_foreignDropdownBuild($foreign, $data, 'id-only');
+ $top = PMA__foreignDropdownBuild($foreign, $data, 'id-only');
}
// beginning of dropdown
hooks/post-receive
--
phpMyAdmin
------------------------------------------------------------------------------
5 Ways to Improve & Secure Unified Communications
Unified Communications promises greater efficiencies for business. UC can
improve internal communications as well as offer faster, more efficient ways
to interact with customers and streamline customer service. Learn more!
http://www.accelacomm.com/jaw/sfnl/114/51426253/
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
