Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
I
ISPConfig 3
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
489
Issues
489
List
Boards
Labels
Service Desk
Milestones
Merge Requests
25
Merge Requests
25
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ISPConfig
ISPConfig 3
Commits
03e39417
Commit
03e39417
authored
Dec 04, 2018
by
Helmo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Pass a client_id to getDataRecord() to not override a session in loadUserProfile()
parent
54c38fc4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
interface/lib/classes/remoting.inc.php
interface/lib/classes/remoting.inc.php
+1
-1
interface/lib/classes/remoting_lib.inc.php
interface/lib/classes/remoting_lib.inc.php
+2
-2
No files found.
interface/lib/classes/remoting.inc.php
View file @
03e39417
...
...
@@ -383,7 +383,7 @@ class remoting {
$app
->
remoting_lib
->
loadFormDef
(
$formdef_file
);
//* get old record and merge with params, so only new values have to be set in $params
$old_rec
=
$app
->
remoting_lib
->
getDataRecord
(
$primary
_id
);
$old_rec
=
$app
->
remoting_lib
->
getDataRecord
(
$primary_id
,
$client
_id
);
foreach
(
$app
->
remoting_lib
->
formDef
[
'fields'
]
as
$fieldName
=>
$fieldConf
)
{
...
...
interface/lib/classes/remoting_lib.inc.php
View file @
03e39417
...
...
@@ -225,10 +225,10 @@ class remoting_lib extends tform_base {
return
$sql
;
}
function
getDataRecord
(
$primary
_id
)
{
function
getDataRecord
(
$primary_id
,
$client
_id
)
{
global
$app
;
$escape
=
'`'
;
$this
->
loadUserProfile
(
);
$this
->
loadUserProfile
(
$client_id
);
if
(
@
is_numeric
(
$primary_id
))
{
if
(
$primary_id
>
0
)
{
// Return a single record
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment