[SPIP] ~spip v3.2.0-->v3.2.1

[lhc/web/www.git] / www / ecrire / iterateur / data.php

diff --git a/www/ecrire/iterateur/data.php b/www/ecrire/iterateur/data.php
index 96e3963..169fa6f 100644 (file)
--- a/www/ecrire/iterateur/data.php
+++ b/www/ecrire/iterateur/data.php
@@ -636,7 +636,7 @@ function inc_object_to_array($object) {
  * @return array|bool
  */
 function inc_yql_to_array_dist($u) {
-       define('_YQL_ENDPOINT', 'http://query.yahooapis.com/v1/public/yql?&env=store%3A%2F%2Fdatatables.org%2Falltableswithkeys&q=');
+       define('_YQL_ENDPOINT', 'https://query.yahooapis.com/v1/public/yql?&env=store%3A%2F%2Fdatatables.org%2Falltableswithkeys&q=');
        $v = recuperer_url($url = _YQL_ENDPOINT . urlencode($u) . '&format=json');
        if (!$v['page']
                or !$w = json_decode($v['page'], true)
@@ -813,7 +813,7 @@ function inc_ls_to_array_dist($u) {
                                unset($b[$k]);
                        }
                }
-               $b['file'] = basename($v);
+               $b['file'] = preg_replace('`/$`','',$v) ;
                $v = array_merge(
                        pathinfo($v),
                        $b