Skip to content

Commit 3471753

Browse files
authored
Merge pull request #350 from iMattPro/fixes-php8
Fixing stuff that won’t work with PHP 8
2 parents 22141d1 + 69e980e commit 3471753

File tree

7 files changed

+5
-23
lines changed

7 files changed

+5
-23
lines changed

attachment/attachment.php

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -352,12 +352,6 @@ public function create_thumbnail($max_width = false, $min_filesize = false)
352352
imagecopyresampled($new_image, $image, 0, 0, 0, 0, $new_width, $new_height, $width, $height);
353353
}
354354

355-
// If we are in safe mode create the destination file prior to using the gd functions to circumvent a PHP bug
356-
if (@ini_get('safe_mode') || @strtolower(ini_get('safe_mode')) == 'on')
357-
{
358-
@touch($destination);
359-
}
360-
361355
switch ($type['format'])
362356
{
363357
case IMG_GIF:

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
}
6262
],
6363
"require": {
64-
"php": ">=5.3.3",
64+
"php": "^7.1.3",
6565
"phpbb/epv": "dev-master@dev",
6666
"phpbb/translation-validator": "~1.5",
6767
"composer/installers": "~1.0",
@@ -71,7 +71,7 @@
7171
"extra": {
7272
"display-name": "phpBB Customisation Database (Titania)",
7373
"soft-require": {
74-
"phpbb/phpbb": "3.2.*@dev"
74+
"phpbb/phpbb": "3.3.*@dev"
7575
}
7676
}
7777
}

includes/objects/author.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ public function assign_details($return = false, $row= false, $revert = true)
352352
}
353353
}
354354
}
355-
$vars['AUTHOR_CONTRIB_LIST'] = implode($type_list, ', ');
355+
$vars['AUTHOR_CONTRIB_LIST'] = implode(', ', $type_list);
356356

357357
/* @todo: automatically display the common author data too...
358358
if (isset($this->sql_data))

includes/overlords/attention.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ public static function display_attention_list($options = array(), $sort = false)
230230
);
231231

232232
// Do we have to?
233-
if ($row['attention_close_user'])
233+
if (!empty($row['attention_close_user']))
234234
{
235235
$output = array_merge(
236236
$output,

includes/overlords/users.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ public static function get_user($user_id, $field = false, $query = false)
165165
}
166166

167167
// Special things...
168-
if ($field[0] == '_')
168+
if (strpos($field, '_') === 0)
169169
{
170170
switch ($field)
171171
{

styles/prosilver/template/common/json_response.html

Lines changed: 0 additions & 1 deletion
This file was deleted.

styles/prosilver/template/common/message_body.html

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)