diff options
| author | Aleksander Machniak <alec@alec.pl> | 2012-08-08 08:58:32 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2012-08-08 08:58:32 +0200 |
| commit | 9bfe14f7781f6f7567cfbf109474254cf6272518 (patch) | |
| tree | 8ab9558c7e5fa500989100a6b4d73e68a79d4234 /plugins | |
| parent | 2b992c5683716faee80e2e0936dc2bbd01b3de09 (diff) | |
| parent | b93f5556f20e8e5ce5c235fee11dec4c2a070060 (diff) | |
Merge branch 'master' of github.com:roundcube/roundcubemail
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/acl/acl.php | 2 | ||||
| -rw-r--r-- | plugins/enigma/enigma.php | 2 | ||||
| -rw-r--r-- | plugins/subscriptions_option/subscriptions_option.php | 2 | ||||
| -rw-r--r-- | plugins/vcard_attachments/vcard_attachments.php | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/plugins/acl/acl.php b/plugins/acl/acl.php index 8709f0b00..144250495 100644 --- a/plugins/acl/acl.php +++ b/plugins/acl/acl.php @@ -615,7 +615,7 @@ class acl extends rcube_plugin private function get_realm() { // When user enters a username without domain part, realm - // alows to add it to the username (and display correct username in the table) + // allows to add it to the username (and display correct username in the table) if (isset($_SESSION['acl_username_realm'])) { return $_SESSION['acl_username_realm']; diff --git a/plugins/enigma/enigma.php b/plugins/enigma/enigma.php index 22afc901d..a4009ce26 100644 --- a/plugins/enigma/enigma.php +++ b/plugins/enigma/enigma.php @@ -429,7 +429,7 @@ class enigma extends rcube_plugin $style = "margin:0 1em; padding:0.2em 0.5em; border:1px solid #999; width: auto" ." border-radius:4px; -moz-border-radius:4px; -webkit-border-radius:4px"; - // add box below messsage body + // add box below message body $p['content'] .= html::p(array('style' => $style), html::a(array( 'href' => "#", diff --git a/plugins/subscriptions_option/subscriptions_option.php b/plugins/subscriptions_option/subscriptions_option.php index 8b27afbdc..b81a5ac8a 100644 --- a/plugins/subscriptions_option/subscriptions_option.php +++ b/plugins/subscriptions_option/subscriptions_option.php @@ -9,7 +9,7 @@ * * Add it to the plugins list in config/main.inc.php to enable the user option * The user option can be hidden and set globally by adding 'use_subscriptions' - * to the the 'dont_override' configure line: + * to the 'dont_override' configure line: * $rcmail_config['dont_override'] = array('use_subscriptions'); * and then set the global preference * $rcmail_config['use_subscriptions'] = true; // or false diff --git a/plugins/vcard_attachments/vcard_attachments.php b/plugins/vcard_attachments/vcard_attachments.php index 1400cd581..ed6d45325 100644 --- a/plugins/vcard_attachments/vcard_attachments.php +++ b/plugins/vcard_attachments/vcard_attachments.php @@ -81,7 +81,7 @@ class vcard_attachments extends rcube_plugin if ($vcard->email[0]) $display .= ' <'.$vcard->email[0].'>'; - // add box below messsage body + // add box below message body $p['content'] .= html::p(array('class' => 'vcardattachment'), html::a(array( 'href' => "#", |