]> _ Git - cubeextranet.git/commitdiff
(no commit message)
authorvincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Fri, 25 Nov 2011 20:10:45 +0000 (20:10 +0000)
committervincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Fri, 25 Nov 2011 20:10:45 +0000 (20:10 +0000)
inc/ws/Controlleur/class.ws.ajax.php

index 812534d2844c0dfcd69239310ce9402b3c365a66..2a745844f3bf6917b9de9db7012e1914ad1bf0b6 100644 (file)
@@ -726,12 +726,12 @@ class wsAjax extends cubeAjax {
                $dao->getLinksAndRulers($book_id, $links, $rulers, $time);\r
                $xls = $dao->getLinksAsExcel($links, $rulers);\r
 \r
-               self::getLinksFromExcel($xls, $links, $rulers);\r
+               self::getLinksFromExcel($xls, $nlinks, $nrulers);\r
 \r
 \r
 \r
                $dao = new wsDAODocument($core->con);\r
-               $dao->setLinksAndRulers($book_id, json_encode($links), json_encode($rulers), 'Restore links from ' . date('Y-m-d H:i:s', $time), $core->user->utilisateur_id);\r
+               $dao->setLinksAndRulers($book_id, json_encode($nlinks), json_encode($nrulers), 'Restore links from ' . date('Y-m-d H:i:s', $time), $core->user->utilisateur_id);\r
        }\r
 \r
        public static function getLinksFromExcel($xls, &$links, &$rulers) {\r
@@ -799,14 +799,14 @@ class wsAjax extends cubeAjax {
 \r
                $specialLinks = array();\r
                foreach ($links as $l) {\r
-                       if (is_int($l['page'])) {\r
+                       if (intval($l['page'])>0) {\r
                                continue;\r
                        }\r
                        $specialLinks[] = $l;\r
                }\r
                $specialRulers = array();\r
                foreach ($rulers as $r) {\r
-                       if (is_int($r['page'])) {\r
+                       if (intval($r['page'])>0) {\r
                                continue;\r
                        }\r
                        $specialRulers[] = $r;\r