Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

/Sources/ShowAttachments.php ~ compatibility fix #3382

Closed
wants to merge 10 commits into from
Closed

/Sources/ShowAttachments.php ~ compatibility fix #3382

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
472e04e
/Sources/ShowAttachments.php ~ compatibility fix
Underdog-01 Apr 7, 2016
3efa3b1
$user_info['permissions'] not set for guests
Underdog-01 Apr 7, 2016
1509d63
adjusted syntax
Underdog-01 Apr 7, 2016
0c506e9
revert /Sources/Load.php edit
Underdog-01 Apr 7, 2016
df7ba8a
/Sources/Security.php ~ fix for array to string error
Underdog-01 Apr 7, 2016
0001c5e
gettype changed to is_array
Underdog-01 Apr 11, 2016
47f7a80
standard closure changed to lambda
Underdog-01 Apr 11, 2016
7fac44d
type set $permission as an array
Underdog-01 Apr 12, 2016
11c14e0
Update Security.php
Underdog-01 Apr 12, 2016
8e99da4
Update ShowAttachments.php
Underdog-01 Apr 22, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Sources/Load.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -605,7 +605,7 @@ function loadUserSettings()
{
// This is what a guest's variables should be.
$username = '';
$user_info = array('groups' => array(-1));
$user_info = array('groups' => array(-1), 'permissions' => array());
$user_settings = array();

if (isset($_COOKIE[$cookiename]) && empty($context['tfa_member']))
Expand Down
3 changes: 2 additions & 1 deletion Sources/ShowAttachments.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ function showAttachment()
$smcFunc['db_free_result']($request);

$file['filePath'] = getAttachmentFilename($file['filename'], $attachId, $file['id_folder'], false, $file['file_hash']);
$file['filePath'] = !file_exists($file['filePath']) ? substr($file['filePath'], 0, -(strlen(pathinfo($file['filePath'])['extension'])+1)) : $file['filePath'];
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pathinfo($file['filePath'])['extension']

This will generate a parse error on PHP < 5.5.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I forgot about that change to PHP.
I'm glad they changed it because 2 lines of code to do one small task seems superfluous.


// ETag time.
$file['etag'] = '"'. md5_file($file['filePath']) .'"';
Expand Down Expand Up @@ -290,4 +291,4 @@ function showAttachment()

die();
}
?>
?>