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

Merge pull request #14846 from Tithugues/feature/replace-if-return-by-return

Browse Source 
Replace if+return by return
This commit is contained in:
Maurício Meneghini Fauth 2019-01-12 13:19:56 -03:00 committed by GitHub
commit 8c8d570fd8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libraries/classes/Export.php
View File

@ -60,16 +60,11 @@ class Export
$chromeAndGreaterThan43 = PMA_USR_BROWSER_AGENT == 'CHROME'
&& PMA_USR_BROWSER_VER >= 43; // see bug #4942
if (function_exists('gzencode')
return function_exists('gzencode')
&& ((! ini_get('zlib.output_compression')
&& ! $this->isGzHandlerEnabled())
|| $GLOBALS['save_on_server']
|| $chromeAndGreaterThan43)
) {
return true;
}
return false;
&& ! $this->isGzHandlerEnabled())
|| $GLOBALS['save_on_server']
|| $chromeAndGreaterThan43);
}
/**

9
libraries/classes/Relation.php
View File

@ -2180,7 +2180,7 @@ class Relation
*/
public function arePmadbTablesDefined()
{
if (empty($GLOBALS['cfg']['Server']['bookmarktable'])
return ! (empty($GLOBALS['cfg']['Server']['bookmarktable'])
|| empty($GLOBALS['cfg']['Server']['relation'])
|| empty($GLOBALS['cfg']['Server']['table_info'])
|| empty($GLOBALS['cfg']['Server']['table_coords'])
@ -2198,12 +2198,7 @@ class Relation
|| empty($GLOBALS['cfg']['Server']['savedsearches'])
|| empty($GLOBALS['cfg']['Server']['central_columns'])
|| empty($GLOBALS['cfg']['Server']['designer_settings'])
|| empty($GLOBALS['cfg']['Server']['export_templates'])
) {
return false;
}
return true;
|| empty($GLOBALS['cfg']['Server']['export_templates']));
}
/**