gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improved function logic to one statement and remove unnecessary functions

Browse Source 
Signed-off-by: Chanaka Indrajith <pe.chanaka.ck@gmail.com>
This commit is contained in:
Chanaka Indrajith 2014-04-05 22:49:13 +05:30
parent 525d8e146e
commit e24d4c3f90
1 changed files with 3 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
libraries/DisplayResults.class.php
View File

@ -2906,7 +2906,7 @@ class PMA_DisplayResults
// Check whether the field needs to display with syntax highlighting
if ($this->_isNeedToSyntaxHighlight($meta->name)
if (! empty($this->transformation_info[strtolower($this->__get('db'))][strtolower($this->__get('table'))][strtolower($meta->nam)])
&& (trim($row[$i]) != '')
) {
$row[$i] = PMA_Util::formatSql($row[$i]);
@ -2938,7 +2938,7 @@ class PMA_DisplayResults
include_once 'libraries/special_schema_links.lib.php';
if (isset($GLOBALS['special_schema_links'])
&& ($this->_isFieldNeedToLink(strtolower($meta->name)))
&& (! empty($GLOBALS['special_schema_links'][strtolower($this->__get('db'))][strtolower($this->__get('table'))][strtolower($meta->name)]))
) {
$linking_url = $this->_getSpecialLinkUrl(
@ -3147,37 +3147,6 @@ class PMA_DisplayResults
} // end of the '_gatherLinksForLaterOutputs()' function
/**
* Check whether any field is marked as need to syntax highlight
*
* @param string $field field to check
*
* @return boolean
*/
private function _isNeedToSyntaxHighlight($field)
{
if (! empty($this->transformation_info[strtolower($this->__get('db'))][strtolower($this->__get('table'))][strtolower($field)])) {
return true;
}
return false;
}
/**
* Check whether the field needs to be link
*
* @param string $field field to check
*
* @return boolean
*/
private function _isFieldNeedToLink($field)
{
if (! empty($GLOBALS['special_schema_links'][strtolower($this->__get('db'))][strtolower($this->__get('table'))][$field])) {
return true;
}
return false;
}
/**
* Get link for display special schema links
*
@ -3822,7 +3791,7 @@ class PMA_DisplayResults
$limitChars = $GLOBALS['cfg']['LimitChars'];
if (($GLOBALS['PMA_String']->strlen($column) > $limitChars)
&& ($_SESSION['tmpval']['pftext'] == self::DISPLAY_PARTIAL_TEXT)
&& ! $this->_isNeedToSyntaxHighlight(strtolower($meta->name))
&& empty($this->transformation_info[strtolower($this->__get('db'))][strtolower($this->__get('table'))][strtolower(strtolower($meta->name))])
) {
$column = $GLOBALS['PMA_String']->substr(
$column, 0, $GLOBALS['cfg']['LimitChars']