Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
CiviCRM Core
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container registry
Model registry
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Development
CiviCRM Core
Commits
b4e262b8
Commit
b4e262b8
authored
6 years ago
by
eileen
Committed by
totten
6 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Remove unused file parameters
parent
00a1b09f
No related branches found
No related tags found
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
CRM/Core/BAO/CustomField.php
+1
-1
1 addition, 1 deletion
CRM/Core/BAO/CustomField.php
CRM/Core/BAO/CustomGroup.php
+1
-1
1 addition, 1 deletion
CRM/Core/BAO/CustomGroup.php
CRM/Core/BAO/File.php
+1
-5
1 addition, 5 deletions
CRM/Core/BAO/File.php
CRM/Core/Page/File.php
+1
-2
1 addition, 2 deletions
CRM/Core/Page/File.php
with
4 additions
and
9 deletions
CRM/Core/BAO/CustomField.php
+
1
−
1
View file @
b4e262b8
...
...
@@ -1494,7 +1494,7 @@ class CRM_Core_BAO_CustomField extends CRM_Core_DAO_CustomField {
'entity_id'
,
'file_id'
);
list
(
$path
)
=
CRM_Core_BAO_File
::
path
(
$fileID
,
$entityId
,
NULL
,
NULL
);
list
(
$path
)
=
CRM_Core_BAO_File
::
path
(
$fileID
,
$entityId
);
$url
=
CRM_Utils_System
::
url
(
'civicrm/file'
,
"reset=1&id=
$fileID
&eid=
$contactID
"
,
$absolute
,
NULL
,
TRUE
,
TRUE
...
...
This diff is collapsed.
Click to expand it.
CRM/Core/BAO/CustomGroup.php
+
1
−
1
View file @
b4e262b8
...
...
@@ -919,7 +919,7 @@ ORDER BY civicrm_custom_group.weight,
);
$customValue
[
'imageURL'
]
=
str_replace
(
'persist/contribute'
,
'custom'
,
$config
->
imageUploadURL
)
.
$fileDAO
->
uri
;
list
(
$path
)
=
CRM_Core_BAO_File
::
path
(
$fileDAO
->
id
,
$entityId
,
NULL
,
NULL
);
list
(
$path
)
=
CRM_Core_BAO_File
::
path
(
$fileDAO
->
id
,
$entityId
);
if
(
$path
&&
file_exists
(
$path
))
{
list
(
$imageWidth
,
$imageHeight
)
=
getimagesize
(
$path
);
list
(
$imageThumbWidth
,
$imageThumbHeight
)
=
CRM_Contact_BAO_Contact
::
getThumbSize
(
$imageWidth
,
$imageHeight
);
...
...
This diff is collapsed.
Click to expand it.
CRM/Core/BAO/File.php
+
1
−
5
View file @
b4e262b8
...
...
@@ -71,15 +71,11 @@ class CRM_Core_BAO_File extends CRM_Core_DAO_File {
/**
* @param int $fileID
* @param int $entityID
* @param null $entityTable
*
* @return array
*/
public
static
function
path
(
$fileID
,
$entityID
,
$entityTable
=
NULL
)
{
public
static
function
path
(
$fileID
,
$entityID
)
{
$entityFileDAO
=
new
CRM_Core_DAO_EntityFile
();
if
(
$entityTable
)
{
$entityFileDAO
->
entity_table
=
$entityTable
;
}
$entityFileDAO
->
entity_id
=
$entityID
;
$entityFileDAO
->
file_id
=
$fileID
;
...
...
This diff is collapsed.
Click to expand it.
CRM/Core/Page/File.php
+
1
−
2
View file @
b4e262b8
...
...
@@ -50,9 +50,8 @@ class CRM_Core_Page_File extends CRM_Core_Page {
$eid
=
CRM_Utils_Request
::
retrieve
(
'eid'
,
'Positive'
,
$this
,
TRUE
);
$fid
=
CRM_Utils_Request
::
retrieve
(
'fid'
,
'Positive'
,
$this
,
FALSE
);
$id
=
CRM_Utils_Request
::
retrieve
(
'id'
,
'Positive'
,
$this
,
TRUE
);
$quest
=
CRM_Utils_Request
::
retrieve
(
'quest'
,
'String'
,
$this
);
list
(
$path
,
$mimeType
)
=
CRM_Core_BAO_File
::
path
(
$id
,
$eid
,
NULL
,
$quest
);
list
(
$path
,
$mimeType
)
=
CRM_Core_BAO_File
::
path
(
$id
,
$eid
);
}
if
(
!
$path
)
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment