The branch, master has been updated
via 0d9a0cb42bb864be0e69579e4e342d801288258d (commit)
from 4fb5b65fd2a2e740842fd0592ebd698d46f46c8b (commit)
- Log -----------------------------------------------------------------
commit 0d9a0cb42bb864be0e69579e4e342d801288258d
Author: Michal Čihař <[email protected]>
Date: Thu Aug 4 13:49:15 2011 +0200
Simplify logic
-----------------------------------------------------------------------
Summary of changes:
libraries/common.lib.php | 17 +++++------------
1 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index fa95d86..bdbd124 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -80,21 +80,14 @@ function PMA_pow($base, $exp, $use_function = false)
*/
function PMA_getIcon($icon, $alternate = '', $force_text = false, $noSprite =
false)
{
- $include_icon = false;
- $include_text = false;
+ // $cfg['PropertiesIconic'] is true or both
+ $include_icon = ($GLOBALS['cfg']['PropertiesIconic'] !== false);
+ // $cfg['PropertiesIconic'] is false or both
+ // OR we have no $include_icon
+ $include_text = ($force_text || true !==
$GLOBALS['cfg']['PropertiesIconic']);
$alternate = htmlspecialchars($alternate);
$button = '';
- if ($GLOBALS['cfg']['PropertiesIconic']) {
- $include_icon = true;
- }
-
- if ($force_text || true !== $GLOBALS['cfg']['PropertiesIconic']) {
- // $cfg['PropertiesIconic'] is false or both
- // OR we have no $include_icon
- $include_text = true;
- }
-
// Always use a span (we rely on this in js/sql.js)
$button .= '<span class="nowrap">';
hooks/post-receive
--
phpMyAdmin
------------------------------------------------------------------------------
BlackBerry® DevCon Americas, Oct. 18-20, San Francisco, CA
The must-attend event for mobile developers. Connect with experts.
Get tools for creating Super Apps. See the latest technologies.
Sessions, hands-on labs, demos & much more. Register early & save!
http://p.sf.net/sfu/rim-blackberry-1
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
