Skip to content
Browse files

Modified some untracked changes

  • Loading branch information...
1 parent 6971295 commit 36ffe5e0a3a922648fff83be5cf9e3ff12fceb2e @Chanaka Chanaka committed Sep 16, 2012
View
3 libraries/List_Database.class.php
@@ -205,8 +205,7 @@ protected function checkOnlyDatabase()
// thus containing not escaped _ or %
if (! preg_match('/(^|[^\\\\])(_|%)/', $each_only_db)) {
// ... not contains wildcard
- $items[] = PMA_CommonFunctions::getInstance()
- ->unescapeMysqlWildcards($each_only_db);
+ $items[] = PMA_Util::unescapeMysqlWildcards($each_only_db);
continue;
}
View
2 libraries/Tracker.class.php
@@ -450,7 +450,7 @@ static public function createDatabaseVersion($dbname, $version, $query,
static private function _changeTracking($dbname, $tablename,
$version, $new_state
) {
- $common_functions= PMA_CommonFunctions::getInstance();
+
$sql_query = " UPDATE " . self::$pma_table .
" SET `tracking_active` = '" . $new_state . "' " .
" WHERE `db_name` = '" . PMA_Util::sqlAddSlashes($dbname) . "' " .
View
6 libraries/insert_edit.lib.php
@@ -495,8 +495,7 @@ function PMA_getFunctionColumn($column, $is_upload, $column_name_appendix,
. ' ' . $unnullify_trigger
. ' tabindex="' . ($tabindex + $tabindex_for_function) . '"'
. ' id="field_' . $idindex . '_1">';
- $html_output .= PMA_CommonFunctions::getInstance()
- ->getFunctionsForField($column, $insert_mode) . "\n";
+ $html_output .= PMA_Util::getFunctionsForField($column, $insert_mode) . "\n";
$html_output .= '</select>' . "\n";
$html_output .= '</td>' . "\n";
@@ -1730,8 +1729,7 @@ function PMA_getSpecialCharsAndBackupFieldForInsertingMode(
$special_chars = htmlspecialchars($column['Default']);
}
$backup_field = '';
- $special_chars_encoded = PMA_CommonFunctions::getInstance()
- ->duplicateFirstNewline($special_chars);
+ $special_chars_encoded = PMA_Util::duplicateFirstNewline($special_chars);
// this will select the UNHEX function while inserting
if (($column['is_binary'] || ($column['is_blob'] && ! $GLOBALS['cfg']['ProtectBinary']))
&& (isset($_SESSION['tmp_user_values']['display_binary_as_hex'])
View
3 libraries/rte/rte_routines.lib.php
@@ -937,8 +937,7 @@ function PMA_RTN_getEditorForm($mode, $operation, $routine)
$retval .= "<tr class='routine_return_row$isfunction_class'>\n";
$retval .= " <td>" . __('Return type') . "</td>\n";
$retval .= " <td><select name='item_returntype'>\n";
- $retval .= PMA_CommonFunctions::getInstance()
- ->getSupportedDatatypes(true, $routine['item_returntype']) . "\n";
+ $retval .= PMA_Util::getSupportedDatatypes(true, $routine['item_returntype']) . "\n";
$retval .= " </select></td>\n";
$retval .= "</tr>\n";
$retval .= "<tr class='routine_return_row$isfunction_class'>\n";
View
3 tbl_zoom_select.php
@@ -68,8 +68,7 @@
$i = 0;
foreach ($row as $col => $val) {
if ($fields_meta[$i]->type == 'bit') {
- $row[$col] = PMA_CommonFunctions::getInstance()
- ->printableBitValue($val, $fields_meta[$i]->length);
+ $row[$col] = PMA_Util::printableBitValue($val, $fields_meta[$i]->length);
}
$i++;
}
View
38 test/libraries/common/PMA_buildActionTitles_test.php
@@ -27,27 +27,25 @@ function setup()
function testBuildActionTitles()
{
$titles = array();
- $common = PMA_CommonFunctions::getInstance();
+ $titles['Browse'] = PMA_Util::getIcon('b_browse.png', __('Browse'));
+ $titles['NoBrowse'] = PMA_Util::getIcon('bd_browse.png', __('Browse'));
+ $titles['Search'] = PMA_Util::getIcon('b_select.png', __('Search'));
+ $titles['NoSearch'] = PMA_Util::getIcon('bd_select.png', __('Search'));
+ $titles['Insert'] = PMA_Util::getIcon('b_insrow.png', __('Insert'));
+ $titles['NoInsert'] = PMA_Util::getIcon('bd_insrow.png', __('Insert'));
+ $titles['Structure'] = PMA_Util::getIcon('b_props.png', __('Structure'));
+ $titles['Drop'] = PMA_Util::getIcon('b_drop.png', __('Drop'));
+ $titles['NoDrop'] = PMA_Util::getIcon('bd_drop.png', __('Drop'));
+ $titles['Empty'] = PMA_Util::getIcon('b_empty.png', __('Empty'));
+ $titles['NoEmpty'] = PMA_Util::getIcon('bd_empty.png', __('Empty'));
+ $titles['Edit'] = PMA_Util::getIcon('b_edit.png', __('Edit'));
+ $titles['NoEdit'] = PMA_Util::getIcon('bd_edit.png', __('Edit'));
+ $titles['Export'] = PMA_Util::getIcon('b_export.png', __('Export'));
+ $titles['NoExport'] = PMA_Util::getIcon('bd_export.png', __('Export'));
+ $titles['Execute'] = PMA_Util::getIcon('b_nextpage.png', __('Execute'));
+ $titles['NoExecute'] = PMA_Util::getIcon('bd_nextpage.png', __('Execute'));
- $titles['Browse'] = $common->getIcon('b_browse.png', __('Browse'));
- $titles['NoBrowse'] = $common->getIcon('bd_browse.png', __('Browse'));
- $titles['Search'] = $common->getIcon('b_select.png', __('Search'));
- $titles['NoSearch'] = $common->getIcon('bd_select.png', __('Search'));
- $titles['Insert'] = $common->getIcon('b_insrow.png', __('Insert'));
- $titles['NoInsert'] = $common->getIcon('bd_insrow.png', __('Insert'));
- $titles['Structure'] = $common->getIcon('b_props.png', __('Structure'));
- $titles['Drop'] = $common->getIcon('b_drop.png', __('Drop'));
- $titles['NoDrop'] = $common->getIcon('bd_drop.png', __('Drop'));
- $titles['Empty'] = $common->getIcon('b_empty.png', __('Empty'));
- $titles['NoEmpty'] = $common->getIcon('bd_empty.png', __('Empty'));
- $titles['Edit'] = $common->getIcon('b_edit.png', __('Edit'));
- $titles['NoEdit'] = $common->getIcon('bd_edit.png', __('Edit'));
- $titles['Export'] = $common->getIcon('b_export.png', __('Export'));
- $titles['NoExport'] = $common->getIcon('bd_export.png', __('Export'));
- $titles['Execute'] = $common->getIcon('b_nextpage.png', __('Execute'));
- $titles['NoExecute'] = $common->getIcon('bd_nextpage.png', __('Execute'));
-
- $this->assertEquals($titles, $common->buildActionTitles());
+ $this->assertEquals($titles, PMA_Util::buildActionTitles());
}
}
View
19 test/libraries/common/PMA_quoting_slashing_test.php
@@ -22,16 +22,15 @@ class PMA_quoting_slashing_test extends PHPUnit_Framework_TestCase
public function testAddSlashes()
{
$string = "\'test''\''\'\r\t\n";
- $common = PMA_CommonFunctions::getInstance();
-
- $this->assertEquals("\\\\\\\\\'test\'\'\\\\\\\\\'\'\\\\\\\\\'\\r\\t\\n", $common->sqlAddSlashes($string, true, true, true));
- $this->assertEquals("\\\\\\\\''test''''\\\\\\\\''''\\\\\\\\''\\r\\t\\n", $common->sqlAddSlashes($string, true, true, false));
- $this->assertEquals("\\\\\\\\\'test\'\'\\\\\\\\\'\'\\\\\\\\\'\r\t\n", $common->sqlAddSlashes($string, true, false, true));
- $this->assertEquals("\\\\\\\\''test''''\\\\\\\\''''\\\\\\\\''\r\t\n", $common->sqlAddSlashes($string, true, false, false));
- $this->assertEquals("\\\\\'test\'\'\\\\\'\'\\\\\'\\r\\t\\n", $common->sqlAddSlashes($string, false, true, true));
- $this->assertEquals("\\\\''test''''\\\\''''\\\\''\\r\\t\\n", $common->sqlAddSlashes($string, false, true, false));
- $this->assertEquals("\\\\\'test\'\'\\\\\'\'\\\\\'\r\t\n", $common->sqlAddSlashes($string, false, false, true));
- $this->assertEquals("\\\\''test''''\\\\''''\\\\''\r\t\n", $common->sqlAddSlashes($string, false, false, false));
+
+ $this->assertEquals("\\\\\\\\\'test\'\'\\\\\\\\\'\'\\\\\\\\\'\\r\\t\\n", PMA_Util::sqlAddSlashes($string, true, true, true));
+ $this->assertEquals("\\\\\\\\''test''''\\\\\\\\''''\\\\\\\\''\\r\\t\\n", PMA_Util::sqlAddSlashes($string, true, true, false));
+ $this->assertEquals("\\\\\\\\\'test\'\'\\\\\\\\\'\'\\\\\\\\\'\r\t\n", PMA_Util::sqlAddSlashes($string, true, false, true));
+ $this->assertEquals("\\\\\\\\''test''''\\\\\\\\''''\\\\\\\\''\r\t\n", PMA_Util::sqlAddSlashes($string, true, false, false));
+ $this->assertEquals("\\\\\'test\'\'\\\\\'\'\\\\\'\\r\\t\\n", PMA_Util::sqlAddSlashes($string, false, true, true));
+ $this->assertEquals("\\\\''test''''\\\\''''\\\\''\\r\\t\\n", PMA_Util::sqlAddSlashes($string, false, true, false));
+ $this->assertEquals("\\\\\'test\'\'\\\\\'\'\\\\\'\r\t\n", PMA_Util::sqlAddSlashes($string, false, false, true));
+ $this->assertEquals("\\\\''test''''\\\\''''\\\\''\r\t\n", PMA_Util::sqlAddSlashes($string, false, false, false));
}
/**

0 comments on commit 36ffe5e

Please sign in to comment.
Something went wrong with that request. Please try again.