From 7e3298753a9f93405ef44b46ba4db4ca98553b51 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sat, 14 Nov 2015 04:08:07 -0500
Subject: [PATCH] Use ternary operator where aplicable
---
program/lib/Roundcube/rcube_mime.php | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/program/lib/Roundcube/rcube_mime.php b/program/lib/Roundcube/rcube_mime.php
index 7001e12..56406b1 100644
--- a/program/lib/Roundcube/rcube_mime.php
+++ b/program/lib/Roundcube/rcube_mime.php
@@ -133,8 +133,8 @@
/**
* Decode a message header value
*
- * @param string $input Header value
- * @param string $fallback Fallback charset if none specified
+ * @param string $input Header value
+ * @param string $fallback Fallback charset if none specified
*
* @return string Decoded string
*/
@@ -155,7 +155,7 @@
*/
public static function decode_mime_string($input, $fallback = null)
{
- $default_charset = !empty($fallback) ? $fallback : self::get_charset();
+ $default_charset = $fallback ?: self::get_charset();
// rfc: all line breaks or other characters not found
// in the Base64 Alphabet must be ignored by decoding software
@@ -290,7 +290,7 @@
}
/**
- * @access private
+ * E-mail address list parser
*/
private static function parse_address_list($str, $decode = true, $fallback = null)
{
@@ -567,7 +567,7 @@
// Note: Never try to use iconv instead of mbstring functions here
// Iconv's substr/strlen are 100x slower (#1489113)
- if ($charset && $charset != RCUBE_CHARSET && function_exists('mb_internal_encoding')) {
+ if ($charset && $charset != RCUBE_CHARSET) {
mb_internal_encoding($charset);
}
@@ -661,7 +661,7 @@
}
}
- if ($charset && $charset != RCUBE_CHARSET && function_exists('mb_internal_encoding')) {
+ if ($charset && $charset != RCUBE_CHARSET) {
mb_internal_encoding(RCUBE_CHARSET);
}
@@ -671,9 +671,9 @@
/**
* A method to guess the mime_type of an attachment.
*
- * @param string $path Path to the file or file contents
- * @param string $name File name (with suffix)
- * @param string $failover Mime type supplied for failover
+ * @param string $path Path to the file or file contents
+ * @param string $name File name (with suffix)
+ * @param string $failover Mime type supplied for failover
* @param boolean $is_stream Set to True if $path contains file contents
* @param boolean $skip_suffix Set to True if the config/mimetypes.php mappig should be ignored
*
--
Gitblit v1.9.1