Home Explore Help
Register Sign In
Omnimaga
/
SMF2.1
mirror of [email protected]:Omnimaga/SMF2.1.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

Merge pull request #690 from Arantor/release-2.1

Just a few things
Arantor 10 years ago
parent
fdc7734176 ab4aa21af9
commit
f6b2cbd712
3 changed files with 2 additions and 2 deletions
Split View Show Diff Stats
  1. 1 1
      Sources/Post.php
  2. 1 1
      Themes/default/ManagePermissions.template.php
  3. BIN
      avatars/Oxygen/wolf.png

+ 1 - 1
Sources/Post.php
View File 

@@ -1695,7 +1695,7 @@ function Post2()
 
 				'tmp_name' => $attachment['tmp_name'],
 
 				'size' => isset($attachment['size']) ? $attachment['size'] : 0,
 
 				'mime_type' => isset($attachment['type']) ? $attachment['type'] : '',
 
-				'id_folder' => $attachment['id_folder'],
 
+				'id_folder' => isset($attachment['id_folder']) ? $attachment['id_folder'] : $modSettings['currentAttachmentUploadDir'],
 
 				'approved' => !$modSettings['postmod_active'] || allowedTo('post_attachment'),
 
 				'errors' => $attachment['errors'],
 
 			);

+ 1 - 1
Themes/default/ManagePermissions.template.php
View File 

@@ -491,7 +491,7 @@ function template_modify_group()
 
 
 	echo '
 
 	<div id="admincenter">
 
-		<form id="admin_form_wrapper" action="', $scripturl, '?action=admin;area=permissions;sa=modify2;group=', $context['group']['id'], ';pid=', $context['profile']['id'], '" method="post" accept-charset="', $context['character_set'], '" name="permissionForm" " onsubmit="return warnAboutDeny();">';
 
+		<form id="admin_form_wrapper" action="', $scripturl, '?action=admin;area=permissions;sa=modify2;group=', $context['group']['id'], ';pid=', $context['profile']['id'], '" method="post" accept-charset="', $context['character_set'], '" name="permissionForm" onsubmit="return warnAboutDeny();">';
 
 
 	if (!empty($modSettings['permission_enable_deny']) && $context['group']['id'] != -1)
 
 		echo '

BIN
avatars/Oxygen/wolf.png
View File