Completed
Pull Request — master (#4890)
by Blizzz
13:28
created
lib/private/Settings/Personal/PersonalInfo.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -135,7 +135,7 @@
 block discarded – undo
135 135
 				$ln = array('code' => $lang, 'name' => $potentialName);
136 136
 			} elseif ($lang === 'en') {
137 137
 				$ln = ['code' => $lang, 'name' => 'English (US)'];
138
-			}else{//fallback to language code
138
+			} else{//fallback to language code
139 139
 				$ln=array('code'=>$lang, 'name'=>$lang);
140 140
 			}
141 141
 
Please login to merge, or discard this patch.
settings/templates/settings/personal/personal.info.php 1 patch
Braces   +27 added lines, -9 removed lines patch added patch discarded remove patch
@@ -42,8 +42,11 @@  discard block
 block discarded – undo
42 42
 					<div class="hidden button icon-delete svg" id="removeavatar" title="<?php p($l->t('Remove image')); ?>"></div>
43 43
 					<input type="file" name="files[]" id="uploadavatar" class="hiddenuploadfield">
44 44
 					<p><em><?php p($l->t('png or jpg, max. 20 MB')); ?></em></p>
45
-				<?php else: ?>
46
-					<?php p($l->t('Picture provided by original account')); ?>
45
+				<?php else {
46
+    : ?>
47
+					<?php p($l->t('Picture provided by original account'));
48
+}
49
+?>
47 50
 				<?php endif; ?>
48 51
 			</div>
49 52
 
@@ -86,7 +89,10 @@  discard block
 block discarded – undo
86 89
 					<label for="email"><?php p($l->t('Email')); ?></label>
87 90
 					<span class="icon-password"/>
88 91
 				</h2>
89
-				<div class="verify <?php if ($_['email'] === ''  || $_['emailScope'] !== 'public') p('hidden'); ?>">
92
+				<div class="verify <?php if ($_['email'] === ''  || $_['emailScope'] !== 'public') {
93
+    p('hidden');
94
+}
95
+?>">
90 96
 					<img id="verify-email" title="<?php p($_['emailMessage']); ?>" data-status="<?php p($_['emailVerification']) ?>" src="
91 97
 				<?php
92 98
 					switch($_['emailVerification']) {
@@ -153,7 +159,10 @@  discard block
 block discarded – undo
153 159
 						<label for="website"><?php p($l->t('Website')); ?></label>
154 160
 						<span class="icon-password"/>
155 161
 					</h2>
156
-					<div class="verify <?php if ($_['website'] === ''  || $_['websiteScope'] !== 'public') p('hidden'); ?>">
162
+					<div class="verify <?php if ($_['website'] === ''  || $_['websiteScope'] !== 'public') {
163
+    p('hidden');
164
+}
165
+?>">
157 166
 						<img id="verify-website" title="<?php p($_['websiteMessage']); ?>" data-status="<?php p($_['websiteVerification']) ?>" src="
158 167
 				<?php
159 168
 						switch($_['websiteVerification']) {
@@ -167,13 +176,16 @@  discard block
 block discarded – undo
167 176
 								p(image_path('core', 'actions/verify.svg'));
168 177
 						}
169 178
 						?>"
170
-							<?php if($_['websiteVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['websiteVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
179
+							<?php if($_['websiteVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['websiteVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) {
180
+    print_unescaped(' class="verify-action"') ?>
171 181
 						>
172 182
 						<div class="verification-dialog popovermenu bubble menu">
173 183
 							<div class="verification-dialog-content">
174 184
 								<p class="explainVerification"></p>
175 185
 								<p class="verificationCode"></p>
176
-								<p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));?></p>
186
+								<p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));
187
+}
188
+?></p>
177 189
 							</div>
178 190
 						</div>
179 191
 					</div>
@@ -190,7 +202,10 @@  discard block
 block discarded – undo
190 202
 						<label for="twitter"><?php p($l->t('Twitter')); ?></label>
191 203
 						<span class="icon-password"/>
192 204
 					</h2>
193
-					<div class="verify <?php if ($_['twitter'] === ''  || $_['twitterScope'] !== 'public') p('hidden'); ?>">
205
+					<div class="verify <?php if ($_['twitter'] === ''  || $_['twitterScope'] !== 'public') {
206
+    p('hidden');
207
+}
208
+?>">
194 209
 						<img id="verify-twitter" title="<?php p($_['twitterMessage']); ?>" data-status="<?php p($_['twitterVerification']) ?>" src="
195 210
 				<?php
196 211
 						switch($_['twitterVerification']) {
@@ -204,13 +219,16 @@  discard block
 block discarded – undo
204 219
 								p(image_path('core', 'actions/verify.svg'));
205 220
 						}
206 221
 						?>"
207
-							<?php if($_['twitterVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['twitterVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
222
+							<?php if($_['twitterVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['twitterVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) {
223
+    print_unescaped(' class="verify-action"') ?>
208 224
 						>
209 225
 						<div class="verification-dialog popovermenu bubble menu">
210 226
 							<div class="verification-dialog-content">
211 227
 								<p class="explainVerification"></p>
212 228
 								<p class="verificationCode"></p>
213
-								<p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));?></p>
229
+								<p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));
230
+}
231
+?></p>
214 232
 							</div>
215 233
 						</div>
216 234
 					</div>
Please login to merge, or discard this patch.