From: vincent@cubedesigners.com Date: Mon, 17 Mar 2014 10:13:13 +0000 (+0000) Subject: (no commit message) X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=93faa403e176d64765f576c5913424db41832480;p=cubeextranet.git --- diff --git a/fluidbook/tools/fwstk/nbproject/private/private.xml b/fluidbook/tools/fwstk/nbproject/private/private.xml index 12af136ca..3f3409ab6 100644 --- a/fluidbook/tools/fwstk/nbproject/private/private.xml +++ b/fluidbook/tools/fwstk/nbproject/private/private.xml @@ -4,10 +4,10 @@ - file:/H:/Works/cubeExtranet/fluidbook/tools/fwstk/src/cube/util/StringUtil.java file:/H:/Works/cubeExtranet/fluidbook/tools/fwstk/src/com/fluidbook/fwstk/Main.java - file:/H:/Works/cubeExtranet/fluidbook/tools/fwstk/src/com/fluidbook/fwstk/layout/Word.java file:/H:/Works/cubeExtranet/fluidbook/tools/fwstk/src/com/fluidbook/fwstk/TextsThread.java + file:/H:/Works/cubeExtranet/fluidbook/tools/fwstk/src/com/fluidbook/fwstk/layout/Word.java + file:/H:/Works/cubeExtranet/fluidbook/tools/fwstk/src/cube/util/StringUtil.java diff --git a/fluidbook/tools/fwstk/src/cube/util/StringUtil.java b/fluidbook/tools/fwstk/src/cube/util/StringUtil.java index 081be3313..cbb00b848 100644 --- a/fluidbook/tools/fwstk/src/cube/util/StringUtil.java +++ b/fluidbook/tools/fwstk/src/cube/util/StringUtil.java @@ -43,7 +43,7 @@ public class StringUtil { } String res = in.replaceAll( - "[\\u2000-\\u20ff\\x21-\\x2f\\x3a-\\x3f\\x5b-\\x5f\\x7b-\\xa0\\xaa-\\xbf’" + ignore + "]", + "[\\u2000-\\u20ff\\x21-\\x2f\\x3a-\\x3f\\x5b-\\x5f\\x7b-\\xa0\\xaa-\\xbf’\\ufffd" + ignore + "]", " "); return res; diff --git a/inc/ws/Controlleur/class.ws.maintenance.php b/inc/ws/Controlleur/class.ws.maintenance.php index 7f10c3985..7d0bcceb7 100644 --- a/inc/ws/Controlleur/class.ws.maintenance.php +++ b/inc/ws/Controlleur/class.ws.maintenance.php @@ -801,7 +801,6 @@ class wsMaintenance { $book_id = $args[0]; wsLinks::getLinksAndRulers($book_id, $links, $rulers); - $newlinks = array(); foreach ($links as $link) { $link['left']-=1; @@ -889,6 +888,9 @@ class wsMaintenance { } } } + + $i = WS_BOOKS . '/index/' . $book_id . '/*'; + `rm -rf $i`; } }