Merge branch 'release-1.1' of github.com:roundcube/roundcubemail into relea...

Aleksander Machniak

2015-02-22 334eb48cfe87ad6bbb98a3da54727d12431ca872

Merge branch 'release-1.1' of github.com:roundcube/roundcubemail into release-1.1

Conflicts:
	CHANGELOG

 plugins/acl/acl.php

@@ -123,7 +123,7 @@
                    $group_id = is_array($record[$group_field]) ? $record[$group_field][0] : $record[$group_field];

                    if ($group) {
                        $users[] = array('name' => ($prefix ? $prefix : '') . $group_id, 'display' => $group);
                        $users[] = array('name' => ($prefix ? $prefix : '') . $group_id, 'display' => $group, 'type' => 'group');
                        $keys[]  = $group;
                    }
                }

 program/lib/Roundcube/rcube_db_mysql.php

@@ -161,15 +161,24 @@
    {
        if (!isset($this->variables)) {
            $this->variables = array();

            $result = $this->query('SHOW VARIABLES');

            while ($row = $this->fetch_array($result)) {
                $this->variables[$row[0]] = $row[1];
            }
        }

        return isset($this->variables[$varname]) ? $this->variables[$varname] : $default;
        if (array_key_exists($varname, $this->variables)) {
            return $this->variables[$varname];
        }

        $result = $this->query('SHOW VARIABLES LIKE ?', $varname);

        while ($row = $this->fetch_array($result)) {
            $this->variables[$row[0]] = $row[1];
        }

        // not found, use default
        if (!isset($this->variables[$varname])) {
            $this->variables[$varname] = $default;
        }

        return $this->variables[$varname];
    }

    /**

 program/steps/mail/get.inc

@@ -164,7 +164,7 @@
                else {
                    // get valid file extensions
                    $extensions      = rcube_mime::get_mime_extensions($real_mimetype);
                    $valid_extension = !$file_extension || in_array($file_extension, (array)$extensions);
                    $valid_extension = !$file_extension || empty($extensions) || in_array($file_extension, (array)$extensions);
                }

                // fix mimetype for images wrongly declared as octet-stream