D2410.1775673860.diff
No OneTemporary
Actions

Authored By

Unknown

Size

1 KB

Referenced Files

None

Subscribers

None

D2410.1775673860.diff
View Options

	diff --git a/src/include/rcube_imap_generic.php b/src/include/rcube_imap_generic.php
	--- a/src/include/rcube_imap_generic.php
	+++ b/src/include/rcube_imap_generic.php
	@@ -787,7 +787,7 @@
	*/
	public function getHierarchyDelimiter()
	{
	- if ($this->prefs['delimiter']) {
	+ if (isset($this->prefs['delimiter'])) {
	return $this->prefs['delimiter'];
	}

	@@ -1435,6 +1435,7 @@
	*/
	public function clearFolder($mailbox)
	{
	+ $res = false;
	if ($this->countMessages($mailbox) > 0) {
	$res = $this->flag($mailbox, '1:*', 'DELETED');
	}
	@@ -1634,10 +1635,11 @@
	return $this->data['EXISTS'];
	}

	- // Check internal cache
	- $cache = $this->data['STATUS:'.$mailbox];
	- if (!empty($cache) && isset($cache['MESSAGES'])) {
	- return (int) $cache['MESSAGES'];
	+ if (isset($this->data["STATUS:".$mailbox])) {
	+ $cache = $this->data["STATUS:".$mailbox];
	+ if (!empty($cache) && isset($cache['MESSAGES'])) {
	+ return (int) $cache['MESSAGES'];
	+ }
	}

	// Try STATUS (should be faster than SELECT)