From 77b5d7ee304a688a2eb115ce04b460b43c0dd700 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sun, 22 May 2016 08:43:54 -0400
Subject: [PATCH] Fix priority icon(s) position
---
program/steps/settings/edit_identity.inc | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/program/steps/settings/edit_identity.inc b/program/steps/settings/edit_identity.inc
index 298822d..a645277 100644
--- a/program/steps/settings/edit_identity.inc
+++ b/program/steps/settings/edit_identity.inc
@@ -1,6 +1,6 @@
<?php
-/*
+/**
+-----------------------------------------------------------------------+
| program/steps/settings/edit_identity.inc |
| |
@@ -73,9 +73,9 @@
// add some labels to client
$OUTPUT->add_label('noemailwarning', 'converting', 'editorwarning');
- $i_size = !empty($attrib['size']) ? $attrib['size'] : 40;
- $t_rows = !empty($attrib['textarearows']) ? $attrib['textarearows'] : 6;
- $t_cols = !empty($attrib['textareacols']) ? $attrib['textareacols'] : 40;
+ $i_size = $attrib['size'] ?: 40;
+ $t_rows = $attrib['textarearows'] ?: 6;
+ $t_cols = $attrib['textareacols'] ?: 40;
// list of available cols
$form = array(
@@ -159,11 +159,8 @@
foreach ($fieldset['content'] as $col => $colprop) {
$colprop['id'] = 'rcmfd_'.$col;
- $label = !empty($colprop['label']) ? $colprop['label'] :
- $RCMAIL->gettext(str_replace('-', '', $col));
-
- $value = !empty($colprop['value']) ? $colprop['value'] :
- rcube_output::get_edit_field($col, $IDENTITY_RECORD[$col], $colprop, $colprop['type']);
+ $label = $colprop['label'] ?: $RCMAIL->gettext(str_replace('-', '', $col));
+ $value = $colprop['value'] ?: rcube_output::get_edit_field($col, $IDENTITY_RECORD[$col], $colprop, $colprop['type']);
$table->add('title', html::label($colprop['id'], rcube::Q($label)));
$table->add(null, $value);
--
Gitblit v1.9.1