projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixes education inclusion.
[platal.git]
/
modules
/
profile.php
diff --git
a/modules/profile.php
b/modules/profile.php
index
7392d5a
..
5a23f80
100644
(file)
--- a/
modules/profile.php
+++ b/
modules/profile.php
@@
-318,6
+318,8
@@
class ProfileModule extends PLModule
$opened_tab = $hrpid;
$hrpid = $aux;
$url_error = true;
$opened_tab = $hrpid;
$hrpid = $aux;
$url_error = true;
+ } else {
+ $url_error = false;
}
$profile = $this->findProfile($hrpid);
if (! ($profile instanceof Profile) && ($profile == PL_NOT_FOUND || $profile == PL_FORBIDDEN)) {
}
$profile = $this->findProfile($hrpid);
if (! ($profile instanceof Profile) && ($profile == PL_NOT_FOUND || $profile == PL_FORBIDDEN)) {
@@
-399,7
+401,7
@@
class ProfileModule extends PLModule
$page->assign('address', array());
}
$page->assign('address', array());
}
- function handler_ajax_tel(&$page, $prefid, $prefname, $telid)
+ function handler_ajax_tel(&$page, $prefid, $prefname, $telid
, $subField, $mainField, $mainId
)
{
pl_content_headers("text/html");
$page->changeTpl('profile/phone.tpl', NO_SKIN);
{
pl_content_headers("text/html");
$page->changeTpl('profile/phone.tpl', NO_SKIN);
@@
-408,6
+410,11
@@
class ProfileModule extends PLModule
$page->assign('telid', $telid);
$phone = new Phone();
$page->assign('tel', $phone->toFormArray());
$page->assign('telid', $telid);
$phone = new Phone();
$page->assign('tel', $phone->toFormArray());
+ if ($mainField) {
+ $page->assign('subField', $subField);
+ $page->assign('mainField', $mainField);
+ $page->assign('mainId', $mainId);
+ }
}
function handler_ajax_edu(&$page, $eduid, $class)
}
function handler_ajax_edu(&$page, $eduid, $class)
@@
-609,7
+616,7
@@
class ProfileModule extends PLModule
}
XDB::query('INSERT INTO search_autocomplete (name, query, result, generated)
VALUES ({?}, {?}, {?}, NOW())
}
XDB::query('INSERT INTO search_autocomplete (name, query, result, generated)
VALUES ({?}, {?}, {?}, NOW())
-
ON DUPLICATE KEY result = VALUES(result), generated = NOW(
)',
+
ON DUPLICATE KEY UPDATE result = VALUES(result), generated = VALUES(generated
)',
$type, $q_normalized, $res);
echo $res;
exit();
$type, $q_normalized, $res);
echo $res;
exit();