projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Release of plat/al 1.1.4
[platal.git]
/
modules
/
profile
/
jobs.inc.php
diff --git
a/modules/profile/jobs.inc.php
b/modules/profile/jobs.inc.php
index
d29a5ef
..
eada2bd
100644
(file)
--- a/
modules/profile/jobs.inc.php
+++ b/
modules/profile/jobs.inc.php
@@
-86,11
+86,11
@@
class ProfileSettingJob implements ProfileSetting
$backtrack[$job['id']] = $key;
}
$backtrack[$job['id']] = $key;
}
- $it = Address::iterate(array($page->pid()), array(Address::LINK_JOB));
+ $it = Address::iterate(array($page->pid()), array(Address::LINK_JOB)
, array(), Visibility::get(Visibility::VIEW_PRIVATE)
);
while ($address = $it->next()) {
$jobs[$address->id]['w_address'] = $address->toFormArray();
}
while ($address = $it->next()) {
$jobs[$address->id]['w_address'] = $address->toFormArray();
}
- $it = Phone::iterate(array($page->pid()), array(Phone::LINK_JOB));
+ $it = Phone::iterate(array($page->pid()), array(Phone::LINK_JOB)
, array(), Visibility::get(Visibility::VIEW_PRIVATE)
);
while ($phone = $it->next()) {
$jobs[$phone->link_id]['w_phone'][$phone->id] = $phone->toFormArray();
}
while ($phone = $it->next()) {
$jobs[$phone->link_id]['w_phone'][$phone->id] = $phone->toFormArray();
}
@@
-178,7
+178,7
@@
class ProfileSettingJob implements ProfileSetting
}
}
}
}
- if (Visibility::isLessRestrictive($job
['w_email_pub'], $job_level
)) {
+ if (Visibility::isLessRestrictive($job
_level, $job['w_email_pub']
)) {
$job['w_email_pub'] = $job_level;
}
$job['w_phone'] = Phone::formatFormArray($job['w_phone'], $s, $job_level);
$job['w_email_pub'] = $job_level;
}
$job['w_phone'] = Phone::formatFormArray($job['w_phone'], $s, $job_level);
@@
-248,7
+248,7
@@
class ProfileSettingJob implements ProfileSetting
// Force the address publicity to be at least as restricted as
// the job publicity.
$job_level = $job['pub'];
// Force the address publicity to be at least as restricted as
// the job publicity.
$job_level = $job['pub'];
- if (Visibility::isLessRestrictive($
address->pub, $job_level
)) {
+ if (Visibility::isLessRestrictive($
job_level, $address->pub
)) {
$address->pub = $job_level;
}
$job['w_address'] = $address->toFormArray();
$address->pub = $job_level;
}
$job['w_address'] = $address->toFormArray();