lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3319 from FHenry/3.7

Browse Source 
FIX : #3318
This commit is contained in:
Laurent Destailleur 2015-07-28 18:30:19 +02:00
commit c42e952ce9
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/adherents/admin/public.php
View File

@ -215,7 +215,12 @@ dol_fiche_end();
print '<br>'; print '<br>';
//print $langs->trans('FollowingLinksArePublic').'<br>'; //print $langs->trans('FollowingLinksArePublic').'<br>';
print img_picto('','object_globe.png').' '.$langs->trans('BlankSubscriptionForm').':<br>'; print img_picto('','object_globe.png').' '.$langs->trans('BlankSubscriptionForm').':<br>';
print '<a target="_blank" href="'.DOL_URL_ROOT.'/public/members/new.php">'.DOL_MAIN_URL_ROOT.'/public/members/new.php</a>'; if ($conf->multicompany->enabled) {
$entity_qr='?entity='.$conf->entity;
} else {
$entity_qr='';
}
print '<a target="_blank" href="'.DOL_URL_ROOT.'/public/members/new.php'.$entity_qr.'">'.DOL_MAIN_URL_ROOT.'/public/members/new.php'.$entity_qr.'</a>';
/* /*
print '<table class="border" cellspacing="0" cellpadding="3">'; print '<table class="border" cellspacing="0" cellpadding="3">';

4
htdocs/core/lib/json.lib.php
View File

@ -251,7 +251,9 @@ function dol_json_decode($json, $assoc=false)
if (! empty($array)) if (! empty($array))
{ {
$object = false; $object = false;
if (count($array)>0) {
$object = (object) array();
}
foreach ($array as $key => $value) foreach ($array as $key => $value)
{ {
if ($key) $object->{$key} = $value; if ($key) $object->{$key} = $value;

2
htdocs/main.inc.php
View File

@ -660,7 +660,7 @@ if (! defined('NOLOGIN'))
$cryptkey = (! empty($conf->file->cookie_cryptkey) ? $conf->file->cookie_cryptkey : '' ); $cryptkey = (! empty($conf->file->cookie_cryptkey) ? $conf->file->cookie_cryptkey : '' );
$entityCookie = new DolCookie($cryptkey); $entityCookie = new DolCookie($cryptkey);
$entityCookie->_setCookie($entityCookieName, $entity, $ttl); $entityCookie->setCookie($entityCookieName, $entity, $ttl);
} }
// Hooks on successfull login // Hooks on successfull login