diff --git a/ecrire/inc/documents.php b/ecrire/inc/documents.php index 166b517dbf307d93becf6611a86ef09b5cb78041..e9c735dc92ac85092176a55b1c7784324380ac58 100644 --- a/ecrire/inc/documents.php +++ b/ecrire/inc/documents.php @@ -117,9 +117,14 @@ function document_et_vignette($document, $url, $portfolio=false) { // // http://doc.spip.org/@afficher_documents_colonne -function afficher_documents_colonne($id, $type="article") { +function afficher_documents_colonne($id, $type="article",$script=NULL) { // seuls cas connus : article, breve ou rubrique - $script = $type.'s_edit'; + if ($script==NULL){ + $script = $type.'s_edit'; + if (_DIR_RESTREINT) + $script = parametre_url(self(),"show_docs",''); + } + /// Ajouter nouvelle image $ret .= "<a name='images'></a>\n"; @@ -174,13 +179,14 @@ function afficher_documents_colonne($id, $type="article") { $ret .= afficher_case_document($doc, $id, $script, $type, false); } $ret .= "</div>"; - - $ret .= "<script src='"._DIR_JAVASCRIPT."async_upload.js' type='text/javascript'></script>\n"; - $ret .= <<<EOF - <script type='text/javascript'> - $("form.form_upload").async_upload(async_upload_article_edit) - </script> + if (!_DIR_RESTREINT){ + $ret .= "<script src='"._DIR_JAVASCRIPT."async_upload.js' type='text/javascript'></script>\n"; + $ret .= <<<EOF + <script type='text/javascript'> + $("form.form_upload").async_upload(async_upload_article_edit) + </script> EOF; + } return $ret; } diff --git a/ecrire/inc/joindre.php b/ecrire/inc/joindre.php index e07bc42eaa6a4546d5f095e46737746679bfe831..5f2320a25a87e5fa36bee04a74ef7001a1fa03b0 100644 --- a/ecrire/inc/joindre.php +++ b/ecrire/inc/joindre.php @@ -82,7 +82,7 @@ function inc_joindre_dist($script, $args, $id=0, $intitule='', $mode='', $type=' return generer_action_auteur('joindre', (intval($id) .'/' .intval($id_document) . "/$mode/$type"), - generer_url_ecrire($script, $args, true), + (_DIR_RESTREINT)?$script:generer_url_ecrire($script, $args, true), "$iframe$debut$intitule$res$dir_ftp$distant$fin", " method='post' enctype='multipart/form-data' class='form_upload'"); }