Passed
Pull Request — release-2.1 (#5958)
by John
03:35
created
other/upgrade.php 2 patches
Spacing   +85 added lines, -85 removed lines patch added patch discarded remove patch
@@ -3122,94 +3122,94 @@
 block discarded – undo
3122 3122
 		// Translation table for the character sets not native for MySQL.
3123 3123
 		$translation_tables = array(
3124 3124
 			'windows-1255' => array(
3125
-				'0x81' => '\'\'',		'0x8A' => '\'\'',		'0x8C' => '\'\'',
3126
-				'0x8D' => '\'\'',		'0x8E' => '\'\'',		'0x8F' => '\'\'',
3127
-				'0x90' => '\'\'',		'0x9A' => '\'\'',		'0x9C' => '\'\'',
3128
-				'0x9D' => '\'\'',		'0x9E' => '\'\'',		'0x9F' => '\'\'',
3129
-				'0xCA' => '\'\'',		'0xD9' => '\'\'',		'0xDA' => '\'\'',
3130
-				'0xDB' => '\'\'',		'0xDC' => '\'\'',		'0xDD' => '\'\'',
3131
-				'0xDE' => '\'\'',		'0xDF' => '\'\'',		'0xFB' => '0xD792',
3132
-				'0xFC' => '0xE282AC',		'0xFF' => '0xD6B2',		'0xC2' => '0xFF',
3133
-				'0x80' => '0xFC',		'0xE2' => '0xFB',		'0xA0' => '0xC2A0',
3134
-				'0xA1' => '0xC2A1',		'0xA2' => '0xC2A2',		'0xA3' => '0xC2A3',
3135
-				'0xA5' => '0xC2A5',		'0xA6' => '0xC2A6',		'0xA7' => '0xC2A7',
3136
-				'0xA8' => '0xC2A8',		'0xA9' => '0xC2A9',		'0xAB' => '0xC2AB',
3137
-				'0xAC' => '0xC2AC',		'0xAD' => '0xC2AD',		'0xAE' => '0xC2AE',
3138
-				'0xAF' => '0xC2AF',		'0xB0' => '0xC2B0',		'0xB1' => '0xC2B1',
3139
-				'0xB2' => '0xC2B2',		'0xB3' => '0xC2B3',		'0xB4' => '0xC2B4',
3140
-				'0xB5' => '0xC2B5',		'0xB6' => '0xC2B6',		'0xB7' => '0xC2B7',
3141
-				'0xB8' => '0xC2B8',		'0xB9' => '0xC2B9',		'0xBB' => '0xC2BB',
3142
-				'0xBC' => '0xC2BC',		'0xBD' => '0xC2BD',		'0xBE' => '0xC2BE',
3143
-				'0xBF' => '0xC2BF',		'0xD7' => '0xD7B3',		'0xD1' => '0xD781',
3144
-				'0xD4' => '0xD7B0',		'0xD5' => '0xD7B1',		'0xD6' => '0xD7B2',
3145
-				'0xE0' => '0xD790',		'0xEA' => '0xD79A',		'0xEC' => '0xD79C',
3146
-				'0xED' => '0xD79D',		'0xEE' => '0xD79E',		'0xEF' => '0xD79F',
3147
-				'0xF0' => '0xD7A0',		'0xF1' => '0xD7A1',		'0xF2' => '0xD7A2',
3148
-				'0xF3' => '0xD7A3',		'0xF5' => '0xD7A5',		'0xF6' => '0xD7A6',
3149
-				'0xF7' => '0xD7A7',		'0xF8' => '0xD7A8',		'0xF9' => '0xD7A9',
3150
-				'0x82' => '0xE2809A',	'0x84' => '0xE2809E',	'0x85' => '0xE280A6',
3151
-				'0x86' => '0xE280A0',	'0x87' => '0xE280A1',	'0x89' => '0xE280B0',
3152
-				'0x8B' => '0xE280B9',	'0x93' => '0xE2809C',	'0x94' => '0xE2809D',
3153
-				'0x95' => '0xE280A2',	'0x97' => '0xE28094',	'0x99' => '0xE284A2',
3154
-				'0xC0' => '0xD6B0',		'0xC1' => '0xD6B1',		'0xC3' => '0xD6B3',
3155
-				'0xC4' => '0xD6B4',		'0xC5' => '0xD6B5',		'0xC6' => '0xD6B6',
3156
-				'0xC7' => '0xD6B7',		'0xC8' => '0xD6B8',		'0xC9' => '0xD6B9',
3157
-				'0xCB' => '0xD6BB',		'0xCC' => '0xD6BC',		'0xCD' => '0xD6BD',
3158
-				'0xCE' => '0xD6BE',		'0xCF' => '0xD6BF',		'0xD0' => '0xD780',
3159
-				'0xD2' => '0xD782',		'0xE3' => '0xD793',		'0xE4' => '0xD794',
3160
-				'0xE5' => '0xD795',		'0xE7' => '0xD797',		'0xE9' => '0xD799',
3161
-				'0xFD' => '0xE2808E',	'0xFE' => '0xE2808F',	'0x92' => '0xE28099',
3162
-				'0x83' => '0xC692',		'0xD3' => '0xD783',		'0x88' => '0xCB86',
3163
-				'0x98' => '0xCB9C',		'0x91' => '0xE28098',	'0x96' => '0xE28093',
3164
-				'0xBA' => '0xC3B7',		'0x9B' => '0xE280BA',	'0xAA' => '0xC397',
3165
-				'0xA4' => '0xE282AA',	'0xE1' => '0xD791',		'0xE6' => '0xD796',
3166
-				'0xE8' => '0xD798',		'0xEB' => '0xD79B',		'0xF4' => '0xD7A4',
3125
+				'0x81' => '\'\'', '0x8A' => '\'\'', '0x8C' => '\'\'',
3126
+				'0x8D' => '\'\'', '0x8E' => '\'\'', '0x8F' => '\'\'',
3127
+				'0x90' => '\'\'', '0x9A' => '\'\'', '0x9C' => '\'\'',
3128
+				'0x9D' => '\'\'', '0x9E' => '\'\'', '0x9F' => '\'\'',
3129
+				'0xCA' => '\'\'', '0xD9' => '\'\'', '0xDA' => '\'\'',
3130
+				'0xDB' => '\'\'', '0xDC' => '\'\'', '0xDD' => '\'\'',
3131
+				'0xDE' => '\'\'', '0xDF' => '\'\'', '0xFB' => '0xD792',
3132
+				'0xFC' => '0xE282AC', '0xFF' => '0xD6B2', '0xC2' => '0xFF',
3133
+				'0x80' => '0xFC', '0xE2' => '0xFB', '0xA0' => '0xC2A0',
3134
+				'0xA1' => '0xC2A1', '0xA2' => '0xC2A2', '0xA3' => '0xC2A3',
3135
+				'0xA5' => '0xC2A5', '0xA6' => '0xC2A6', '0xA7' => '0xC2A7',
3136
+				'0xA8' => '0xC2A8', '0xA9' => '0xC2A9', '0xAB' => '0xC2AB',
3137
+				'0xAC' => '0xC2AC', '0xAD' => '0xC2AD', '0xAE' => '0xC2AE',
3138
+				'0xAF' => '0xC2AF', '0xB0' => '0xC2B0', '0xB1' => '0xC2B1',
3139
+				'0xB2' => '0xC2B2', '0xB3' => '0xC2B3', '0xB4' => '0xC2B4',
3140
+				'0xB5' => '0xC2B5', '0xB6' => '0xC2B6', '0xB7' => '0xC2B7',
3141
+				'0xB8' => '0xC2B8', '0xB9' => '0xC2B9', '0xBB' => '0xC2BB',
3142
+				'0xBC' => '0xC2BC', '0xBD' => '0xC2BD', '0xBE' => '0xC2BE',
3143
+				'0xBF' => '0xC2BF', '0xD7' => '0xD7B3', '0xD1' => '0xD781',
3144
+				'0xD4' => '0xD7B0', '0xD5' => '0xD7B1', '0xD6' => '0xD7B2',
3145
+				'0xE0' => '0xD790', '0xEA' => '0xD79A', '0xEC' => '0xD79C',
3146
+				'0xED' => '0xD79D', '0xEE' => '0xD79E', '0xEF' => '0xD79F',
3147
+				'0xF0' => '0xD7A0', '0xF1' => '0xD7A1', '0xF2' => '0xD7A2',
3148
+				'0xF3' => '0xD7A3', '0xF5' => '0xD7A5', '0xF6' => '0xD7A6',
3149
+				'0xF7' => '0xD7A7', '0xF8' => '0xD7A8', '0xF9' => '0xD7A9',
3150
+				'0x82' => '0xE2809A', '0x84' => '0xE2809E', '0x85' => '0xE280A6',
3151
+				'0x86' => '0xE280A0', '0x87' => '0xE280A1', '0x89' => '0xE280B0',
3152
+				'0x8B' => '0xE280B9', '0x93' => '0xE2809C', '0x94' => '0xE2809D',
3153
+				'0x95' => '0xE280A2', '0x97' => '0xE28094', '0x99' => '0xE284A2',
3154
+				'0xC0' => '0xD6B0', '0xC1' => '0xD6B1', '0xC3' => '0xD6B3',
3155
+				'0xC4' => '0xD6B4', '0xC5' => '0xD6B5', '0xC6' => '0xD6B6',
3156
+				'0xC7' => '0xD6B7', '0xC8' => '0xD6B8', '0xC9' => '0xD6B9',
3157
+				'0xCB' => '0xD6BB', '0xCC' => '0xD6BC', '0xCD' => '0xD6BD',
3158
+				'0xCE' => '0xD6BE', '0xCF' => '0xD6BF', '0xD0' => '0xD780',
3159
+				'0xD2' => '0xD782', '0xE3' => '0xD793', '0xE4' => '0xD794',
3160
+				'0xE5' => '0xD795', '0xE7' => '0xD797', '0xE9' => '0xD799',
3161
+				'0xFD' => '0xE2808E', '0xFE' => '0xE2808F', '0x92' => '0xE28099',
3162
+				'0x83' => '0xC692', '0xD3' => '0xD783', '0x88' => '0xCB86',
3163
+				'0x98' => '0xCB9C', '0x91' => '0xE28098', '0x96' => '0xE28093',
3164
+				'0xBA' => '0xC3B7', '0x9B' => '0xE280BA', '0xAA' => '0xC397',
3165
+				'0xA4' => '0xE282AA', '0xE1' => '0xD791', '0xE6' => '0xD796',
3166
+				'0xE8' => '0xD798', '0xEB' => '0xD79B', '0xF4' => '0xD7A4',
3167 3167
 				'0xFA' => '0xD7AA',
3168 3168
 			),
3169 3169
 			'windows-1253' => array(
3170
-				'0x81' => '\'\'',			'0x88' => '\'\'',			'0x8A' => '\'\'',
3171
-				'0x8C' => '\'\'',			'0x8D' => '\'\'',			'0x8E' => '\'\'',
3172
-				'0x8F' => '\'\'',			'0x90' => '\'\'',			'0x98' => '\'\'',
3173
-				'0x9A' => '\'\'',			'0x9C' => '\'\'',			'0x9D' => '\'\'',
3174
-				'0x9E' => '\'\'',			'0x9F' => '\'\'',			'0xAA' => '\'\'',
3175
-				'0xD2' => '0xE282AC',			'0xFF' => '0xCE92',			'0xCE' => '0xCE9E',
3176
-				'0xB8' => '0xCE88',		'0xBA' => '0xCE8A',		'0xBC' => '0xCE8C',
3177
-				'0xBE' => '0xCE8E',		'0xBF' => '0xCE8F',		'0xC0' => '0xCE90',
3178
-				'0xC8' => '0xCE98',		'0xCA' => '0xCE9A',		'0xCC' => '0xCE9C',
3179
-				'0xCD' => '0xCE9D',		'0xCF' => '0xCE9F',		'0xDA' => '0xCEAA',
3180
-				'0xE8' => '0xCEB8',		'0xEA' => '0xCEBA',		'0xEC' => '0xCEBC',
3181
-				'0xEE' => '0xCEBE',		'0xEF' => '0xCEBF',		'0xC2' => '0xFF',
3182
-				'0xBD' => '0xC2BD',		'0xED' => '0xCEBD',		'0xB2' => '0xC2B2',
3183
-				'0xA0' => '0xC2A0',		'0xA3' => '0xC2A3',		'0xA4' => '0xC2A4',
3184
-				'0xA5' => '0xC2A5',		'0xA6' => '0xC2A6',		'0xA7' => '0xC2A7',
3185
-				'0xA8' => '0xC2A8',		'0xA9' => '0xC2A9',		'0xAB' => '0xC2AB',
3186
-				'0xAC' => '0xC2AC',		'0xAD' => '0xC2AD',		'0xAE' => '0xC2AE',
3187
-				'0xB0' => '0xC2B0',		'0xB1' => '0xC2B1',		'0xB3' => '0xC2B3',
3188
-				'0xB5' => '0xC2B5',		'0xB6' => '0xC2B6',		'0xB7' => '0xC2B7',
3189
-				'0xBB' => '0xC2BB',		'0xE2' => '0xCEB2',		'0x80' => '0xD2',
3190
-				'0x82' => '0xE2809A',	'0x84' => '0xE2809E',	'0x85' => '0xE280A6',
3191
-				'0x86' => '0xE280A0',	'0xA1' => '0xCE85',		'0xA2' => '0xCE86',
3192
-				'0x87' => '0xE280A1',	'0x89' => '0xE280B0',	'0xB9' => '0xCE89',
3193
-				'0x8B' => '0xE280B9',	'0x91' => '0xE28098',	'0x99' => '0xE284A2',
3194
-				'0x92' => '0xE28099',	'0x93' => '0xE2809C',	'0x94' => '0xE2809D',
3195
-				'0x95' => '0xE280A2',	'0x96' => '0xE28093',	'0x97' => '0xE28094',
3196
-				'0x9B' => '0xE280BA',	'0xAF' => '0xE28095',	'0xB4' => '0xCE84',
3197
-				'0xC1' => '0xCE91',		'0xC3' => '0xCE93',		'0xC4' => '0xCE94',
3198
-				'0xC5' => '0xCE95',		'0xC6' => '0xCE96',		'0x83' => '0xC692',
3199
-				'0xC7' => '0xCE97',		'0xC9' => '0xCE99',		'0xCB' => '0xCE9B',
3200
-				'0xD0' => '0xCEA0',		'0xD1' => '0xCEA1',		'0xD3' => '0xCEA3',
3201
-				'0xD4' => '0xCEA4',		'0xD5' => '0xCEA5',		'0xD6' => '0xCEA6',
3202
-				'0xD7' => '0xCEA7',		'0xD8' => '0xCEA8',		'0xD9' => '0xCEA9',
3203
-				'0xDB' => '0xCEAB',		'0xDC' => '0xCEAC',		'0xDD' => '0xCEAD',
3204
-				'0xDE' => '0xCEAE',		'0xDF' => '0xCEAF',		'0xE0' => '0xCEB0',
3205
-				'0xE1' => '0xCEB1',		'0xE3' => '0xCEB3',		'0xE4' => '0xCEB4',
3206
-				'0xE5' => '0xCEB5',		'0xE6' => '0xCEB6',		'0xE7' => '0xCEB7',
3207
-				'0xE9' => '0xCEB9',		'0xEB' => '0xCEBB',		'0xF0' => '0xCF80',
3208
-				'0xF1' => '0xCF81',		'0xF2' => '0xCF82',		'0xF3' => '0xCF83',
3209
-				'0xF4' => '0xCF84',		'0xF5' => '0xCF85',		'0xF6' => '0xCF86',
3210
-				'0xF7' => '0xCF87',		'0xF8' => '0xCF88',		'0xF9' => '0xCF89',
3211
-				'0xFA' => '0xCF8A',		'0xFB' => '0xCF8B',		'0xFC' => '0xCF8C',
3212
-				'0xFD' => '0xCF8D',		'0xFE' => '0xCF8E',
3170
+				'0x81' => '\'\'', '0x88' => '\'\'', '0x8A' => '\'\'',
3171
+				'0x8C' => '\'\'', '0x8D' => '\'\'', '0x8E' => '\'\'',
3172
+				'0x8F' => '\'\'', '0x90' => '\'\'', '0x98' => '\'\'',
3173
+				'0x9A' => '\'\'', '0x9C' => '\'\'', '0x9D' => '\'\'',
3174
+				'0x9E' => '\'\'', '0x9F' => '\'\'', '0xAA' => '\'\'',
3175
+				'0xD2' => '0xE282AC', '0xFF' => '0xCE92', '0xCE' => '0xCE9E',
3176
+				'0xB8' => '0xCE88', '0xBA' => '0xCE8A', '0xBC' => '0xCE8C',
3177
+				'0xBE' => '0xCE8E', '0xBF' => '0xCE8F', '0xC0' => '0xCE90',
3178
+				'0xC8' => '0xCE98', '0xCA' => '0xCE9A', '0xCC' => '0xCE9C',
3179
+				'0xCD' => '0xCE9D', '0xCF' => '0xCE9F', '0xDA' => '0xCEAA',
3180
+				'0xE8' => '0xCEB8', '0xEA' => '0xCEBA', '0xEC' => '0xCEBC',
3181
+				'0xEE' => '0xCEBE', '0xEF' => '0xCEBF', '0xC2' => '0xFF',
3182
+				'0xBD' => '0xC2BD', '0xED' => '0xCEBD', '0xB2' => '0xC2B2',
3183
+				'0xA0' => '0xC2A0', '0xA3' => '0xC2A3', '0xA4' => '0xC2A4',
3184
+				'0xA5' => '0xC2A5', '0xA6' => '0xC2A6', '0xA7' => '0xC2A7',
3185
+				'0xA8' => '0xC2A8', '0xA9' => '0xC2A9', '0xAB' => '0xC2AB',
3186
+				'0xAC' => '0xC2AC', '0xAD' => '0xC2AD', '0xAE' => '0xC2AE',
3187
+				'0xB0' => '0xC2B0', '0xB1' => '0xC2B1', '0xB3' => '0xC2B3',
3188
+				'0xB5' => '0xC2B5', '0xB6' => '0xC2B6', '0xB7' => '0xC2B7',
3189
+				'0xBB' => '0xC2BB', '0xE2' => '0xCEB2', '0x80' => '0xD2',
3190
+				'0x82' => '0xE2809A', '0x84' => '0xE2809E', '0x85' => '0xE280A6',
3191
+				'0x86' => '0xE280A0', '0xA1' => '0xCE85', '0xA2' => '0xCE86',
3192
+				'0x87' => '0xE280A1', '0x89' => '0xE280B0', '0xB9' => '0xCE89',
3193
+				'0x8B' => '0xE280B9', '0x91' => '0xE28098', '0x99' => '0xE284A2',
3194
+				'0x92' => '0xE28099', '0x93' => '0xE2809C', '0x94' => '0xE2809D',
3195
+				'0x95' => '0xE280A2', '0x96' => '0xE28093', '0x97' => '0xE28094',
3196
+				'0x9B' => '0xE280BA', '0xAF' => '0xE28095', '0xB4' => '0xCE84',
3197
+				'0xC1' => '0xCE91', '0xC3' => '0xCE93', '0xC4' => '0xCE94',
3198
+				'0xC5' => '0xCE95', '0xC6' => '0xCE96', '0x83' => '0xC692',
3199
+				'0xC7' => '0xCE97', '0xC9' => '0xCE99', '0xCB' => '0xCE9B',
3200
+				'0xD0' => '0xCEA0', '0xD1' => '0xCEA1', '0xD3' => '0xCEA3',
3201
+				'0xD4' => '0xCEA4', '0xD5' => '0xCEA5', '0xD6' => '0xCEA6',
3202
+				'0xD7' => '0xCEA7', '0xD8' => '0xCEA8', '0xD9' => '0xCEA9',
3203
+				'0xDB' => '0xCEAB', '0xDC' => '0xCEAC', '0xDD' => '0xCEAD',
3204
+				'0xDE' => '0xCEAE', '0xDF' => '0xCEAF', '0xE0' => '0xCEB0',
3205
+				'0xE1' => '0xCEB1', '0xE3' => '0xCEB3', '0xE4' => '0xCEB4',
3206
+				'0xE5' => '0xCEB5', '0xE6' => '0xCEB6', '0xE7' => '0xCEB7',
3207
+				'0xE9' => '0xCEB9', '0xEB' => '0xCEBB', '0xF0' => '0xCF80',
3208
+				'0xF1' => '0xCF81', '0xF2' => '0xCF82', '0xF3' => '0xCF83',
3209
+				'0xF4' => '0xCF84', '0xF5' => '0xCF85', '0xF6' => '0xCF86',
3210
+				'0xF7' => '0xCF87', '0xF8' => '0xCF88', '0xF9' => '0xCF89',
3211
+				'0xFA' => '0xCF8A', '0xFB' => '0xCF8B', '0xFC' => '0xCF8C',
3212
+				'0xFD' => '0xCF8D', '0xFE' => '0xCF8E',
3213 3213
 			),
3214 3214
 		);
3215 3215
 
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -3244,7 +3244,9 @@
 block discarded – undo
3244 3244
 		return $string;
3245 3245
 
3246 3246
 	// This bit fixes incorrect string lengths, which can happen if the character encoding was changed (e.g. conversion to UTF-8)
3247
-	$new_string = preg_replace_callback('~\bs:(\d+):"(.*?)";(?=$|[bidsa]:|[{}]|N;)~s', function($matches) {return 's:' . strlen($matches[2]) . ':"' . $matches[2] . '";'; }, $string);
3247
+	$new_string = preg_replace_callback('~\bs:(\d+):"(.*?)";(?=$|[bidsa]:|[{}]|N;)~s', function($matches)
3248
+	{
3249
+return 's:' . strlen($matches[2]) . ':"' . $matches[2] . '";'; }, $string);
3248 3250
 
3249 3251
 	// @todo Add more possible fixes here. For example, fix incorrect array lengths, try to handle truncated strings gracefully, etc.
3250 3252
 
Please login to merge, or discard this patch.
Sources/Subs-Db-postgresql.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -978,7 +978,7 @@
 block discarded – undo
978 978
 	if (filter_var($error_array[2], FILTER_VALIDATE_IP) === false)
979 979
 		$error_array[2] = null;
980 980
 
981
-	if(empty($db_persist))
981
+	if (empty($db_persist))
982 982
 	{ // without pooling
983 983
 		if (empty($pg_error_data_prep))
984 984
 			$pg_error_data_prep = pg_prepare($db_connection, 'smf_log_errors',
Please login to merge, or discard this patch.
Sources/ManageSmileys.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1996,7 +1996,9 @@
 block discarded – undo
1996 1996
 	// Remove anything that isn't actually new from our list of files
1997 1997
 	foreach ($to_unset as $key => $ids)
1998 1998
 	{
1999
-		if (array_reduce($ids, function($carry, $item) { return $carry * $item; }, true) == true)
1999
+		if (array_reduce($ids, function($carry, $item)
2000
+		{
2001
+return $carry * $item; }, true) == true)
2000 2002
 			unset($smiley_files[$key]);
2001 2003
 	}
2002 2004
 
Please login to merge, or discard this patch.
Sources/Class-Package.php 1 patch
Braces   +9 added lines, -6 removed lines patch added patch discarded remove patch
@@ -941,8 +941,9 @@  discard block
 block discarded – undo
941 941
 	{
942 942
 		// Wait for a response that isn't continued with -, but don't wait too long.
943 943
 		$time = time();
944
-		do
945
-			$this->last_message = fgets($this->connection, 1024);
944
+		do {
945
+					$this->last_message = fgets($this->connection, 1024);
946
+		}
946 947
 		while ((strlen($this->last_message) < 4 || strpos($this->last_message, ' ') === 0 || strpos($this->last_message, ' ', 3) !== 3) && time() - $time < 5);
947 948
 
948 949
 		// Was the desired response returned?
@@ -963,8 +964,9 @@  discard block
 block discarded – undo
963 964
 		// Request a passive connection - this means, we'll talk to you, you don't talk to us.
964 965
 		@fwrite($this->connection, 'PASV' . "\r\n");
965 966
 		$time = time();
966
-		do
967
-			$response = fgets($this->connection, 1024);
967
+		do {
968
+					$response = fgets($this->connection, 1024);
969
+		}
968 970
 		while (strpos($response, ' ', 3) !== 3 && time() - $time < 5);
969 971
 
970 972
 		// If it's not 227, we weren't given an IP and port, which means it failed.
@@ -1086,8 +1088,9 @@  discard block
 block discarded – undo
1086 1088
 
1087 1089
 		@fwrite($this->connection, 'PWD' . "\r\n");
1088 1090
 		$time = time();
1089
-		do
1090
-			$response = fgets($this->connection, 1024);
1091
+		do {
1092
+					$response = fgets($this->connection, 1024);
1093
+		}
1091 1094
 		while ($response[3] != ' ' && time() - $time < 5);
1092 1095
 
1093 1096
 		// Check for 257!
Please login to merge, or discard this patch.
Sources/Subs-Admin.php 1 patch
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -948,7 +948,7 @@
 block discarded – undo
948 948
 			// Add this setting's value.
949 949
 			elseif (isset($config_vars[$var]) || is_null($config_vars[$var]))
950 950
 			{
951
-				$replacement .= '$' . $var . ' = ' . $pretty_var_export($config_vars[$var], TRUE) . ";\n";
951
+				$replacement .= '$' . $var . ' = ' . $pretty_var_export($config_vars[$var], true) . ";\n";
952 952
 				unset($config_vars[$var]);
953 953
 			}
954 954
 			// Uh-oh! Something must have gone horribly, inconceivably wrong.
Please login to merge, or discard this patch.
Sources/Subs.php 2 patches
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -5618,13 +5618,13 @@  discard block
 block discarded – undo
5618 5618
 
5619 5619
 	// UTF-8 occurences of MS special characters
5620 5620
 	$findchars_utf8 = array(
5621
-		"\xe2\x80\x9a",	// single low-9 quotation mark
5622
-		"\xe2\x80\x9e",	// double low-9 quotation mark
5623
-		"\xe2\x80\xa6",	// horizontal ellipsis
5624
-		"\xe2\x80\x98",	// left single curly quote
5625
-		"\xe2\x80\x99",	// right single curly quote
5626
-		"\xe2\x80\x9c",	// left double curly quote
5627
-		"\xe2\x80\x9d",	// right double curly quote
5621
+		"\xe2\x80\x9a", // single low-9 quotation mark
5622
+		"\xe2\x80\x9e", // double low-9 quotation mark
5623
+		"\xe2\x80\xa6", // horizontal ellipsis
5624
+		"\xe2\x80\x98", // left single curly quote
5625
+		"\xe2\x80\x99", // right single curly quote
5626
+		"\xe2\x80\x9c", // left double curly quote
5627
+		"\xe2\x80\x9d", // right double curly quote
5628 5628
 	);
5629 5629
 
5630 5630
 	// windows 1252 / iso equivalents
@@ -5640,13 +5640,13 @@  discard block
 block discarded – undo
5640 5640
 
5641 5641
 	// safe replacements
5642 5642
 	$replacechars = array(
5643
-		',',	// &sbquo;
5644
-		',,',	// &bdquo;
5645
-		'...',	// &hellip;
5646
-		"'",	// &lsquo;
5647
-		"'",	// &rsquo;
5648
-		'"',	// &ldquo;
5649
-		'"',	// &rdquo;
5643
+		',', // &sbquo;
5644
+		',,', // &bdquo;
5645
+		'...', // &hellip;
5646
+		"'", // &lsquo;
5647
+		"'", // &rsquo;
5648
+		'"', // &ldquo;
5649
+		'"', // &rdquo;
5650 5650
 	);
5651 5651
 
5652 5652
 	if ($context['utf8'])
Please login to merge, or discard this patch.
Braces   -1 removed lines patch added patch discarded remove patch
@@ -7196,7 +7196,6 @@
 block discarded – undo
7196 7196
 
7197 7197
 			$length += array_length($value, $deep_count);
7198 7198
 		}
7199
-
7200 7199
 		else
7201 7200
 			$length += strlen($value);
7202 7201
 	}
Please login to merge, or discard this patch.