/***************************************************************************\
* SPIP, Systeme de publication pour l'internet *
* *
- * Copyright (c) 2001-2013 *
+ * Copyright (c) 2001-2014 *
* Arnaud Martin, Antoine Pitrou, Philippe Riviere, Emmanuel Saint-James *
* *
* Ce programme est un logiciel libre distribue sous licence GNU/GPL. *
$erreurs['url'] = _T('info_obligatoire');
}
else {
- $type_urls = $GLOBALS['meta']['type_urls'];
+ $type_urls = ((isset($GLOBALS['type_urls']) AND $GLOBALS['type_urls']!='page')?$GLOBALS['type_urls']:$GLOBALS['meta']['type_urls']);
if ($type_urls=='arbo' AND strpos($url,'/')!==false){
$url = explode('/',$url);
if (count($url)>2)
// les urls manuelles sont toujours permanentes
$set = array('url' => _request('url'), 'type' => $type, 'id_objet' => $id, 'perma'=>1);
- $type_urls = $GLOBALS['meta']['type_urls'];
+ $type_urls = ((isset($GLOBALS['type_urls']) AND $GLOBALS['type_urls']!='page')?$GLOBALS['type_urls']:$GLOBALS['meta']['type_urls']);
if (include_spip("urls/$type_urls")
AND function_exists($renseigner_url = "renseigner_url_$type_urls")
AND $r = $renseigner_url($type,$id)