Updated .gitignore files to remove lib/ path ignoring.
This commit is contained in:
parent
8f133f68af
commit
b138f17ffc
2
.gitignore
vendored
2
.gitignore
vendored
@ -1463,8 +1463,6 @@ install/media/
|
||||
!install/media/sign1.png
|
||||
!install/media/step.png
|
||||
|
||||
lib/
|
||||
|
||||
lib/object_business/*
|
||||
|
||||
lib/object_coordination/*
|
||||
|
@ -290,7 +290,7 @@ class Navigation extends Plugin{
|
||||
* @param chaine identifiant du message(optionnel)...
|
||||
* @return chaine url formatté
|
||||
*/
|
||||
public static function formatUrl($oid, $className, $methodName, $msg="", $param="", $navigationNodeId=null)
|
||||
public static function formatUrl($oid, $className, $methodName, $msg="", $param="", $navigationNodeId=null, $urlparam=null)
|
||||
{
|
||||
global $SERVER_NAME, $SCRIPT_NAME, $CONF_PERSISTANT_SECURE;
|
||||
if ($GLOBALS["CONF_PLUGIN_URL_REWRITE"])
|
||||
@ -318,6 +318,8 @@ class Navigation extends Plugin{
|
||||
$url.="&msg=".$msg;
|
||||
if ($param!="")
|
||||
$url.="¶m=".$param;
|
||||
if ($urlparam!="")
|
||||
$url.="&".$urlparam;
|
||||
}else{
|
||||
$url =$GLOBALS['CONF_PAGE_EXECUTION'];
|
||||
if($GLOBALS['CONF_URL_KEY']){
|
||||
|
Loading…
x
Reference in New Issue
Block a user