Permalink
Browse files

Renamed PMA_CommonFunctions::getInstance()-> with PMA_Util::

  • Loading branch information...
1 parent e6894be commit 6971295e9616aa6809ffd58dceb6e6735090f57d @Chanaka Chanaka committed Sep 16, 2012
Showing with 291 additions and 291 deletions.
  1. +2 −2 browse_foreigners.php
  2. +3 −3 db_create.php
  3. +5 −5 db_datadict.php
  4. +4 −4 db_printview.php
  5. +1 −1 db_search.php
  6. +2 −2 index.php
  7. +3 −3 libraries/Advisor.class.php
  8. +1 −1 libraries/DisplayResults.class.php
  9. +1 −1 libraries/File.class.php
  10. +1 −1 libraries/Footer.class.php
  11. +2 −2 libraries/Header.class.php
  12. +1 −1 libraries/PDF.class.php
  13. +3 −3 libraries/RecentTable.class.php
  14. +3 −3 libraries/StorageEngine.class.php
  15. +3 −3 libraries/Table.class.php
  16. +1 −1 libraries/TableSearch.class.php
  17. +1 −1 libraries/common.inc.php
  18. +1 −1 libraries/config/FormDisplay.tpl.php
  19. +1 −1 libraries/core.lib.php
  20. +4 −4 libraries/database_interface.lib.php
  21. +2 −2 libraries/db_common.inc.php
  22. +2 −2 libraries/db_table_exists.lib.php
  23. +3 −3 libraries/display_create_database.lib.php
  24. +1 −1 libraries/display_create_table.lib.php
  25. +1 −1 libraries/display_select_lang.lib.php
  26. +2 −2 libraries/import.lib.php
  27. +12 −12 libraries/insert_edit.lib.php
  28. +1 −1 libraries/ip_allow_deny.lib.php
  29. +1 −1 libraries/js_escape.lib.php
  30. +10 −10 libraries/operations.lib.php
  31. +3 −3 libraries/plugin_interface.lib.php
  32. +1 −1 libraries/plugins/auth/AuthenticationConfig.class.php
  33. +2 −2 libraries/plugins/auth/AuthenticationCookie.class.php
  34. +1 −1 libraries/plugins/auth/AuthenticationSignon.class.php
  35. +1 −1 libraries/plugins/export/ExportHtmlword.class.php
  36. +2 −2 libraries/plugins/export/ExportLatex.class.php
  37. +2 −2 libraries/plugins/export/ExportMediawiki.class.php
  38. +1 −1 libraries/plugins/export/ExportOdt.class.php
  39. +3 −3 libraries/plugins/export/ExportPhparray.class.php
  40. +2 −2 libraries/plugins/export/ExportSql.class.php
  41. +1 −1 libraries/plugins/export/ExportTexytext.class.php
  42. +1 −1 libraries/plugins/import/ImportCsv.class.php
  43. +1 −1 libraries/plugins/import/ImportLdi.class.php
  44. +1 −1 libraries/plugins/import/ImportXml.class.php
  45. +1 −1 libraries/plugins/transformations/abstract/DateFormatTransformationsPlugin.class.php
  46. +3 −3 libraries/pmd_common.php
  47. +1 −1 libraries/relation.lib.php
  48. +1 −1 libraries/replication_gui.lib.php
  49. +1 −1 libraries/rte/rte_events.lib.php
  50. +2 −2 libraries/rte/rte_export.lib.php
  51. +1 −1 libraries/rte/rte_footer.lib.php
  52. +3 −3 libraries/rte/rte_list.lib.php
  53. +1 −1 libraries/rte/rte_main.inc.php
  54. +3 −3 libraries/rte/rte_routines.lib.php
  55. +6 −6 libraries/rte/rte_triggers.lib.php
  56. +1 −1 libraries/schema/Visio_Relation_Schema.class.php
  57. +1 −1 libraries/server_common.inc.php
  58. +14 −14 libraries/server_privileges.lib.php
  59. +2 −2 libraries/server_synchronize.lib.php
  60. +2 −2 libraries/sql_query_form.lib.php
  61. +6 −6 libraries/structure.lib.php
  62. +1 −1 libraries/tbl_common.inc.php
  63. +1 −1 libraries/tbl_info.inc.php
  64. +1 −1 libraries/tbl_properties.inc.php
  65. +2 −2 libraries/user_preferences.inc.php
  66. +1 −1 main.php
  67. +1 −1 pmd_general.php
  68. +2 −2 prefs_manage.php
  69. +1 −1 server_collations.php
  70. +2 −2 server_plugins.php
  71. +2 −2 server_synchronize.php
  72. +1 −1 tbl_alter.php
  73. +1 −1 tbl_export.php
  74. +1 −1 tbl_indexes.php
  75. +1 −1 tbl_printview.php
  76. +1 −1 tbl_relation.php
  77. +1 −1 tbl_zoom_select.php
  78. +1 −1 test/libraries/common/PMA_browseUploadFile_test.php
  79. +19 −19 test/libraries/common/PMA_cache_test.php
  80. +2 −2 test/libraries/common/PMA_checkParameters_test.php
  81. +1 −1 test/libraries/common/PMA_contains_nonprintable_ascii_test.php
  82. +1 −1 test/libraries/common/PMA_convert_bit_default_value_test.php
  83. +2 −2 test/libraries/common/PMA_escapeMySqlWildcards_test.php
  84. +2 −2 test/libraries/common/PMA_expandUserString_test.php
  85. +1 −1 test/libraries/common/PMA_extractColumnSpec_test.php
  86. +4 −4 test/libraries/common/PMA_extractValueFromFormattedSize_test.php
  87. +1 −1 test/libraries/common/PMA_foreignKeySupported_test.php
  88. +2 −2 test/libraries/common/PMA_formatNumberByteDown_test.php
  89. +15 −15 test/libraries/common/PMA_formatSql_test.php
  90. +1 −1 test/libraries/common/PMA_generateHiddenMaxFileSize_test.php
  91. +4 −4 test/libraries/common/PMA_getCheckbox_test.php
  92. +4 −4 test/libraries/common/PMA_getDbLink_test.php
  93. +3 −3 test/libraries/common/PMA_getDivForSliderEffect_test.php
  94. +3 −3 test/libraries/common/PMA_getDropdown_test.php
  95. +1 −1 test/libraries/common/PMA_getFormattedMaximumUploadSize_test.php
  96. +4 −4 test/libraries/common/PMA_getIcon_test.php
  97. +8 −8 test/libraries/common/PMA_getRadioFields_test.php
  98. +1 −1 test/libraries/common/PMA_getTitleForTarget_test.php
  99. +2 −2 test/libraries/common/PMA_localisedDateTimespan_test.php
  100. +7 −7 test/libraries/common/PMA_pow_test.php
  101. +1 −1 test/libraries/common/PMA_printableBitValue_test.php
  102. +9 −9 test/libraries/common/PMA_quoting_slashing_test.php
  103. +1 −1 test/libraries/common/PMA_showDocu_test.php
  104. +2 −2 test/libraries/common/PMA_showMessage_test_disabled.php
  105. +1 −1 test/libraries/common/PMA_showPHPDocu_test.php
  106. +4 −4 test/libraries/common/PMA_stringOperations_test.php
  107. +1 −1 test/libraries/common/PMA_unsupportedDatatypes_test.php
  108. +4 −4 test/libraries/common/PMA_whichCrlf_test.php
  109. +1 −1 test/libraries/core/PMA_headerLocation_test.php
  110. +1 −1 test/theme.php
  111. +2 −2 transformation_wrapper.php
  112. +2 −2 user_password.php
  113. +3 −3 view_create.php
  114. +1 −1 view_operations.php
View
@@ -11,7 +11,7 @@
$field = $_REQUEST['field'];
-PMA_CommonFunctions::getInstance()->checkParameters(array('db', 'table', 'field'));
+PMA_Util::checkParameters(array('db', 'table', 'field'));
$response = PMA_Response::getInstance();
$response->getFooter()->setMinimal();
@@ -65,7 +65,7 @@
$nbTotalPage = @ceil($foreignData['the_total'] / $session_max_rows);
if ($foreignData['the_total'] > $GLOBALS['cfg']['MaxRows']) {
- $gotopage = PMA_CommonFunctions::getInstance()->pageselector(
+ $gotopage = PMA_Util::pageselector(
$session_max_rows,
$pageNow,
$nbTotalPage,
View
@@ -29,7 +29,7 @@
}
}
-PMA_CommonFunctions::getInstance()->checkParameters(array('new_db'));
+PMA_Util::checkParameters(array('new_db'));
/**
* Defines the url to return to in case of error in a sql statement
@@ -39,7 +39,7 @@
/**
* Builds and executes the db creation sql query
*/
-$sql_query = 'CREATE DATABASE ' . PMA_CommonFunctions::getInstance()->backquote($new_db);
+$sql_query = 'CREATE DATABASE ' . PMA_Util::backquote($new_db);
if (! empty($db_collation)) {
list($db_charset) = explode('_', $db_collation);
if (in_array($db_charset, $mysql_charsets)
@@ -137,7 +137,7 @@
$response->addJSON('new_db_string', $new_db_string);
$response->addJSON(
'sql_query',
- PMA_CommonFunctions::getInstance()->getMessage(
+ PMA_Util::getMessage(
null, $sql_query, 'success'
)
);
View
@@ -27,7 +27,7 @@
/**
* Check parameters
*/
-PMA_CommonFunctions::getInstance()->checkParameters(array('db'));
+PMA_Util::checkParameters(array('db'));
/**
* Defines the url to return to in case of error in a sql statement
@@ -125,8 +125,8 @@
// http://bugs.mysql.com/20910.
$show_create_table_query = 'SHOW CREATE TABLE '
- . PMA_CommonFunctions::getInstance()->backquote($db) . '.'
- . PMA_CommonFunctions::getInstance()->backquote($table);
+ . PMA_Util::backquote($db) . '.'
+ . PMA_Util::backquote($table);
$show_create_table = PMA_DBI_fetch_value(
$show_create_table_query, 0, 1
);
@@ -186,7 +186,7 @@
$row['Null'] = 'NO';
}
$extracted_columnspec
- = PMA_CommonFunctions::getInstance()->extractColumnSpec($row['Type']);
+ = PMA_Util::extractColumnSpec($row['Type']);
// reformat mysql query output
// set or enum types: slashes single quotes inside options
@@ -285,6 +285,6 @@
/**
* Displays the footer
*/
-echo PMA_CommonFunctions::getInstance()->getButton();
+echo PMA_Util::getButton();
?>
View
@@ -35,7 +35,7 @@
// speedup view on locked tables
// Special speedup for newer MySQL Versions (in 4.0 format changed)
if ($cfg['SkipLockedTables'] == true) {
- $result = PMA_DBI_query('SHOW OPEN TABLES FROM ' . PMA_CommonFunctions::getInstance()->backquote($db) . ';');
+ $result = PMA_DBI_query('SHOW OPEN TABLES FROM ' . PMA_Util::backquote($db) . ';');
// Blending out tables in use
if ($result != false && PMA_DBI_num_rows($result) > 0) {
while ($tmp = PMA_DBI_fetch_row($result)) {
@@ -47,11 +47,11 @@
PMA_DBI_free_result($result);
if (isset($sot_cache)) {
- $result = PMA_DBI_query('SHOW TABLES FROM ' . PMA_CommonFunctions::getInstance()->backquote($db) . ';', null, PMA_DBI_QUERY_STORE);
+ $result = PMA_DBI_query('SHOW TABLES FROM ' . PMA_Util::backquote($db) . ';', null, PMA_DBI_QUERY_STORE);
if ($result != false && PMA_DBI_num_rows($result) > 0) {
while ($tmp = PMA_DBI_fetch_row($result)) {
if (! isset($sot_cache[$tmp[0]])) {
- $sts_result = PMA_DBI_query('SHOW TABLE STATUS FROM ' . PMA_CommonFunctions::getInstance()->backquote($db) . ' LIKE \'' . sqlAddSlashes($tmp[0], true) . '\';');
+ $sts_result = PMA_DBI_query('SHOW TABLE STATUS FROM ' . PMA_Util::backquote($db) . ' LIKE \'' . sqlAddSlashes($tmp[0], true) . '\';');
$sts_tmp = PMA_DBI_fetch_assoc($sts_result);
$tables[] = $sts_tmp;
} else { // table in use
@@ -67,7 +67,7 @@
}
if (! isset($sot_ready)) {
- $result = PMA_DBI_query('SHOW TABLE STATUS FROM ' . PMA_CommonFunctions::getInstance()->backquote($db) . ';');
+ $result = PMA_DBI_query('SHOW TABLE STATUS FROM ' . PMA_Util::backquote($db) . ';');
if (PMA_DBI_num_rows($result) > 0) {
while ($sts_tmp = PMA_DBI_fetch_assoc($result)) {
$tables[] = $sts_tmp;
View
@@ -26,7 +26,7 @@
// If config variable $GLOBALS['cfg']['Usedbsearch'] is on false : exit.
if (! $GLOBALS['cfg']['UseDbSearch']) {
- PMA_CommonFunctions::getInstance()->mysqlDie(
+ PMA_Util::mysqlDie(
__('Access denied'), '', false, $err_url
);
} // end if
View
@@ -107,8 +107,8 @@
var token = '<?php echo PMA_escapeJsString($_SESSION[' PMA_token ']); ?>';
var text_dir = '<?php echo PMA_escapeJsString($GLOBALS['text_dir']); ?>';
var pma_absolute_uri = '<?php echo PMA_escapeJsString($GLOBALS['cfg']['PmaAbsoluteUri']); ?>';
- var pma_text_default_tab = '<?php echo PMA_escapeJsString(PMA_CommonFunctions::getInstance()->getTitleForTarget($GLOBALS['cfg']['DefaultTabTable'])); ?>';
- var pma_text_left_default_tab = '<?php echo PMA_escapeJsString(PMA_CommonFunctions::getInstance()->getTitleForTarget($GLOBALS['cfg']['LeftDefaultTabTable'])); ?>';
+ var pma_text_default_tab = '<?php echo PMA_escapeJsString(PMA_Util::getTitleForTarget($GLOBALS['cfg']['DefaultTabTable'])); ?>';
+ var pma_text_left_default_tab = '<?php echo PMA_escapeJsString(PMA_Util::getTitleForTarget($GLOBALS['cfg']['LeftDefaultTabTable'])); ?>';
// for content and navigation frames
@@ -437,20 +437,20 @@ function ADVISOR_bytime($num, $precision)
$num = round($num, $precision);
if ($num == 0) {
- $num = '<' . PMA_CommonFunctions::getInstance()->pow(10, -$precision);
+ $num = '<' . PMA_Util::pow(10, -$precision);
}
return "$num $per";
}
function ADVISOR_timespanFormat($val)
{
- return PMA_CommonFunctions::getInstance()->timespanFormat($val);
+ return PMA_Util::timespanFormat($val);
}
function ADVISOR_formatByteDown($value, $limes = 6, $comma = 0)
{
- return PMA_CommonFunctions::getInstance()->formatByteDown($value, $limes, $comma);
+ return PMA_Util::formatByteDown($value, $limes, $comma);
}
?>
@@ -2797,7 +2797,7 @@ private function _getRowValues(
) {
$parsed_sql = PMA_SQP_parse($row[$i]);
- $row[$i] = PMA_CommonFunctions::getInstance()->formatSql(
+ $row[$i] = PMA_Util::formatSql(
$parsed_sql, $row[$i]
);
include_once $this->sytax_highlighting_column_info[strtolower($this->__get('_db'))][strtolower($this->__get('_table'))][strtolower($meta->name)][0];
View
@@ -426,7 +426,7 @@ function setLocalSelectedFile($name)
}
$this->setName(
- PMA_CommonFunctions::getInstance()->userDir($GLOBALS['cfg']['UploadDir']) . PMA_securePath($name)
+ PMA_Util::userDir($GLOBALS['cfg']['UploadDir']) . PMA_securePath($name)
);
if (! $this->isReadable()) {
$this->_error_message = __('File could not be read');
@@ -196,7 +196,7 @@ private function _getSelfLink($url_params)
$retval .= '<a href="index.php' . PMA_generate_common_url($url_params) . '"'
. ' title="' . __('Open new phpMyAdmin window') . '" target="_blank">';
if ($GLOBALS['cfg']['NavigationBarIconic']) {
- $retval .= PMA_CommonFunctions::getInstance()->getImage(
+ $retval .= PMA_Util::getImage(
'window-new.png',
__('Open new phpMyAdmin window')
);
@@ -169,7 +169,7 @@ private function _addDefaultScripts()
);
$this->_scripts->addFile('functions.js');
$this->_scripts->addCode(
- PMA_CommonFunctions::getInstance()->getReloadNavigationScript(true)
+ PMA_Util::getReloadNavigationScript(true)
);
}
@@ -452,7 +452,7 @@ private function _getPageTitle()
$temp_title = $GLOBALS['cfg']['TitleDefault'];
}
$this->_title = htmlspecialchars(
- PMA_CommonFunctions::getInstance()->expandUserString($temp_title)
+ PMA_Util::expandUserString($temp_title)
);
} else {
$this->_title = 'phpMyAdmin';
View
@@ -48,7 +48,7 @@ function Footer()
$this->SetY(-15);
$this->SetFont(PMA_PDF_FONT, '', 14);
$this->Cell(0, 6, __('Page number:') . ' ' . $this->getAliasNumPage() . '/' . $this->getAliasNbPages(), 'T', 0, 'C');
- $this->Cell(0, 6, PMA_CommonFunctions::getInstance()->localisedDate(), 0, 1, 'R');
+ $this->Cell(0, 6, PMA_Util::localisedDate(), 0, 1, 'R');
$this->SetY(20);
// set footerset
@@ -47,8 +47,8 @@ public function __construct()
if (strlen($GLOBALS['cfg']['Server']['pmadb'])
&& strlen($GLOBALS['cfg']['Server']['recent'])
) {
- $this->pma_table = PMA_CommonFunctions::getInstance()->backquote($GLOBALS['cfg']['Server']['pmadb']) . "."
- . PMA_CommonFunctions::getInstance()->backquote($GLOBALS['cfg']['Server']['recent']);
+ $this->pma_table = PMA_Util::backquote($GLOBALS['cfg']['Server']['pmadb']) . "."
+ . PMA_Util::backquote($GLOBALS['cfg']['Server']['recent']);
}
$server_id = $GLOBALS['server'];
if (! isset($_SESSION['tmp_user_values']['recent_tables'][$server_id])) {
@@ -102,7 +102,7 @@ public function saveToDb()
$sql_query
= " REPLACE INTO " . $this->pma_table . " (`username`, `tables`)" .
" VALUES ('" . $username . "', '"
- . PMA_CommonFunctions::getInstance()->sqlAddSlashes(
+ . PMA_Util::sqlAddSlashes(
json_encode($this->tables)
) . "')";
@@ -186,7 +186,7 @@ function getHtmlVariables()
. ' <td>' . "\n";
if (! empty($details['desc'])) {
$ret .= ' '
- . PMA_CommonFunctions::getInstance()->showHint($details['desc'])
+ . PMA_Util::showHint($details['desc'])
. "\n";
}
$ret .= ' </td>' . "\n"
@@ -199,7 +199,7 @@ function getHtmlVariables()
unset($parsed_size);
break;
case PMA_ENGINE_DETAILS_TYPE_NUMERIC:
- $ret .= PMA_CommonFunctions::getInstance()->formatNumber($details['value']) . ' ';
+ $ret .= PMA_Util::formatNumber($details['value']) . ' ';
break;
default:
$ret .= htmlspecialchars($details['value']) . ' ';
@@ -232,7 +232,7 @@ function getHtmlVariables()
*/
function resolveTypeSize($value)
{
- return PMA_CommonFunctions::getInstance()->formatByteDown($value);
+ return PMA_Util::formatByteDown($value);
}
/**
@@ -548,8 +548,8 @@ static public function countRecords($db, $table, $force_exact = false,
// fast enough
if (! $is_view || (PMA_DRIZZLE && PMA_is_system_schema($db))) {
$row_count = PMA_DBI_fetch_value(
- 'SELECT COUNT(*) FROM ' . PMA_CommonFunctions::getInstance()->backquote($db) . '.'
- . PMA_CommonFunctions::getInstance()->backquote($table)
+ 'SELECT COUNT(*) FROM ' . PMA_Util::backquote($db) . '.'
+ . PMA_Util::backquote($table)
);
} else {
// For complex views, even trying to get a partial record
@@ -612,7 +612,7 @@ static public function generateAlter($oldcol, $newcol, $type, $length,
$attribute, $collation, $null, $default_type, $default_value,
$extra, $comment, &$field_primary, $index, $move_to
) {
- return PMA_CommonFunctions::getInstance()->backquote($oldcol) . ' '
+ return PMA_Util::backquote($oldcol) . ' '
. PMA_Table::generateFieldSpec(
$newcol, $type, $index, $length, $attribute,
$collation, $null, $default_type, $default_value, $extra,
@@ -1114,7 +1114,7 @@ public function getSelectionForm($goto, $dataLabel = null)
$html_output = '<ul id="topmenu2">';
foreach ($this->_getSubTabs() as $tab) {
- $html_output .= PMA_CommonFunctions::getInstance()->getHtmlTab($tab, $url_params);
+ $html_output .= PMA_Util::getHtmlTab($tab, $url_params);
}
$html_output .= '</ul>';
$html_output .= '<div class="clearfloat"></div>';
View
@@ -1027,7 +1027,7 @@
* (note: when $cfg['ServerDefault'] = 0, constant is not defined)
*/
if (isset($_REQUEST['profiling'])
- && PMA_CommonFunctions::getInstance()->profilingSupported()
+ && PMA_Util::profilingSupported()
) {
$_SESSION['profiling'] = true;
} elseif (isset($_REQUEST['profiling_form'])) {
@@ -168,7 +168,7 @@ function PMA_displayInput($path, $name, $type, $value, $description = '',
} else {
// In this case we just use getImage() because it's available
foreach ($icon_init as $k => $v) {
- $icons[$k] = PMA_CommonFunctions::getInstance()->getImage(
+ $icons[$k] = PMA_Util::getImage(
$v[0], $v[1]
);
}
View
@@ -305,7 +305,7 @@ function PMA_warnMissingExtension($extension, $fatal = false, $extra = '')
function PMA_getTableCount($db)
{
$tables = PMA_DBI_try_query(
- 'SHOW TABLES FROM ' . PMA_CommonFunctions::getInstance()->backquote($db) . ';',
+ 'SHOW TABLES FROM ' . PMA_Util::backquote($db) . ';',
null, PMA_DBI_QUERY_STORE
);
if ($tables) {
@@ -59,7 +59,7 @@ function PMA_DBI_checkDbExtension($extension = 'mysql')
PMA_warnMissingExtension(
$GLOBALS['cfg']['Server']['extension'],
false,
- PMA_CommonFunctions::getInstance()->showDocu('faqmysql')
+ PMA_Util::showDocu('faqmysql')
);
if ($GLOBALS['cfg']['Server']['extension'] === 'mysql') {
@@ -73,7 +73,7 @@ function PMA_DBI_checkDbExtension($extension = 'mysql')
PMA_warnMissingExtension(
$GLOBALS['cfg']['Server']['extension'],
true,
- PMA_CommonFunctions::getInstance()->showDocu('faqmysql')
+ PMA_Util::showDocu('faqmysql')
);
}
@@ -101,7 +101,7 @@ function PMA_DBI_query($query, $link = null, $options = 0,
$cache_affected_rows = true
) {
$res = PMA_DBI_try_query($query, $link, $options, $cache_affected_rows)
- or PMA_CommonFunctions::getInstance()->mysqlDie(PMA_DBI_getError($link), $query);
+ or PMA_Util::mysqlDie(PMA_DBI_getError($link), $query);
return $res;
}
@@ -314,7 +314,7 @@ function PMA_DBI_convert_message($message)
function PMA_DBI_get_tables($database, $link = null)
{
return PMA_DBI_fetch_result(
- 'SHOW TABLES FROM ' . PMA_CommonFunctions::getInstance()->backquote($database) . ';',
+ 'SHOW TABLES FROM ' . PMA_Util::backquote($database) . ';',
null,
0,
$link,
@@ -14,7 +14,7 @@
*/
require_once './libraries/bookmark.lib.php';
-PMA_CommonFunctions::getInstance()->checkParameters(array('db'));
+PMA_Util::checkParameters(array('db'));
$is_show_stats = $cfg['ShowStats'];
@@ -61,7 +61,7 @@
if (isset($submitcollation) && !empty($db_collation)) {
list($db_charset) = explode('_', $db_collation);
$sql_query = 'ALTER DATABASE '
- . PMA_CommonFunctions::getInstance()->backquote($db)
+ . PMA_Util::backquote($db)
. ' DEFAULT' . PMA_generateCharsetQueryPart($db_collation);
$result = PMA_DBI_query($sql_query);
$message = PMA_Message::success();
@@ -50,7 +50,7 @@
if (! $is_table) {
$_result = PMA_DBI_try_query(
- 'SHOW TABLES LIKE \'' . PMA_CommonFunctions::getInstance()->sqlAddSlashes($table, true) . '\';',
+ 'SHOW TABLES LIKE \'' . PMA_Util::sqlAddSlashes($table, true) . '\';',
null, PMA_DBI_QUERY_STORE
);
$is_table = @PMA_DBI_num_rows($_result);
@@ -72,7 +72,7 @@
* only happen if IS_TRANSFORMATION_WRAPPER?
*/
$_result = PMA_DBI_try_query(
- 'SELECT COUNT(*) FROM ' . PMA_CommonFunctions::getInstance()->backquote($table) . ';',
+ 'SELECT COUNT(*) FROM ' . PMA_Util::backquote($table) . ';',
null,
PMA_DBI_QUERY_STORE
);
Oops, something went wrong.

0 comments on commit 6971295

Please sign in to comment.