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

Fix: regression and use an exist alternative root

Browse Source
This commit is contained in:
Regis Houssin 2010-12-16 11:06:24 +00:00
parent 201a28e952
commit bba1df29c3
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/admin/modules.php
View File

@ -374,7 +374,7 @@ if ($mode != 4)
} }
else else
{ {
print '<a href="'.DOL_URL_ROOT.'/custom/modules/'.$regs[2].'/admin/'.$regs[1].'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"),"setup").'</a>&nbsp;'; print '<a href="'.DOL_URL_EXTMODULE.'/'.$regs[2].'/admin/'.$regs[1].'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"),"setup").'</a>&nbsp;';
} }
} }
else else
@ -393,7 +393,7 @@ if ($mode != 4)
} }
else else
{ {
print '<td align="right" valign="top"><a href="'.DOL_URL_ROOT.'/custom/modules/'.$regs[2].'/admin/'.$regs[1].'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"),"setup").'</a></td>'; print '<td align="right" valign="top"><a href="'.DOL_URL_EXTMODULE.'/'.$regs[2].'/admin/'.$regs[1].'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"),"setup").'</a></td>';
} }
} }
else else

3
htdocs/includes/menus/standard/eldy.lib.php
View File

@ -453,7 +453,8 @@ function print_eldy_menu($db,$atarget,$type_user)
} }
else else
{ {
$url=DOL_URL_ROOT.$tabMenu[$i]['url']; if (file_exists(DOL_DOCUMENT_ROOT.$tabMenu[$i]['url'])) $url=DOL_URL_ROOT.$tabMenu[$i]['url'];
else $url=DOL_URL_EXTMODULE.$tabMenu[$i]['url'];
if (! preg_match('/\?/',$url)) $url.='?'; if (! preg_match('/\?/',$url)) $url.='?';
else $url.='&'; else $url.='&';
if (! preg_match('/mainmenu/i',$url) || ! preg_match('/leftmenu/i',$url)) if (! preg_match('/mainmenu/i',$url) || ! preg_match('/leftmenu/i',$url))