From 0344b168276f80189e2254c75a762aff5b517b6b Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sun, 22 May 2016 06:32:57 -0400
Subject: [PATCH] Fix priority icon(s) position
---
program/include/rcmail.php | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index bdf9405..f97e659 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -840,6 +840,8 @@
// this need to be full url to make redirects work
$absolute = true;
}
+ else if ($secure && ($token = $this->get_request_token()))
+ $url .= $delm . '_token=' . urlencode($token);
if ($absolute || $full) {
// add base path to this Roundcube installation
@@ -2169,7 +2171,7 @@
/**
* Returns supported font-family specifications
*
- * @param string $font Font name
+ * @param string $font Font name
*
* @param string|array Font-family specification array or string (if $font is used)
*/
@@ -2201,8 +2203,8 @@
/**
* Create a human readable string for a number of bytes
*
- * @param int Number of bytes
- * @param string Size unit
+ * @param int $bytes Number of bytes
+ * @param string &$unit Size unit
*
* @return string Byte string
*/
@@ -2233,7 +2235,7 @@
/**
* Returns real size (calculated) of the message part
*
- * @param rcube_message_part Message part
+ * @param rcube_message_part $part Message part
*
* @return string Part size (and unit)
*/
@@ -2243,12 +2245,12 @@
$size = $this->show_bytes((int)$part->d_parameters['size']);
}
else {
- $size = $part->size;
- if ($part->encoding == 'base64') {
- $size = $size / 1.33;
- }
+ $size = $part->size;
+ if ($part->encoding == 'base64') {
+ $size = $size / 1.33;
+ }
- $size = '~' . $this->show_bytes($size);
+ $size = '~' . $this->show_bytes($size);
}
return $size;
@@ -2317,6 +2319,8 @@
* Get resource file content (with assets_dir support)
*
* @param string $name File name
+ *
+ * @return string File content
*/
public function get_resource_content($name)
{
--
Gitblit v1.9.1