wait #2453 @1.5

diff --git a/inc/ws/Util/html5/class.ws.html5.php b/inc/ws/Util/html5/class.ws.html5.php
index 3db883a3572fc5bb4076ec7e74baab2ae7b3bb95..cd935441abd0e67d4c046161d21bdcb4e7db5330 100644 (file)
--- a/inc/ws/Util/html5/class.ws.html5.php
+++ b/inc/ws/Util/html5/class.ws.html5.php
@@ -4,6 +4,18 @@ class wsHTML5
 {\r
        protected static $uaPrefixes = array('-moz-', '-webkit-', '-o-', '-ms-', '');\r
 \r
+       /**\r
+        * @param $book_id\r
+        * @param string $version\r
+        * @param bool $phonegap\r
+        * @param string $phonegapVersion\r
+        * @param null $dir\r
+        * @param bool $standalone\r
+        * @param bool $appcache\r
+        * @param bool $home\r
+        * @param null $book\r
+        * @return wsHTML5Compiler\r
+        */\r
        public static function compilerFactory($book_id, $version = 'stable', $phonegap = false, $phonegapVersion = 'latest', $dir = null, $standalone = false, $appcache = false, $home = false, $book = null)\r
        {\r
                if (is_null($version)) {\r

diff --git a/inc/ws/Util/html5/master/class.ws.html5.seo.php b/inc/ws/Util/html5/master/class.ws.html5.seo.php
index 1dd123a4b934f516f1e75e97401eb999468d637f..c094021bba22c6deae17510e76b37da20e19b4b8 100644 (file)
--- a/inc/ws/Util/html5/master/class.ws.html5.seo.php
+++ b/inc/ws/Util/html5/master/class.ws.html5.seo.php
@@ -58,6 +58,7 @@ class wsHTML5Seo
 \r
                        foreach ($a as $item) {\r
                                $page = $item['page'] + $offsetPage;\r
+                               $item['url'] = CubeIT_Text::removeAccents($item['url']);\r
                                foreach ($item as $k => $v) {\r
                                        if ($k == 'page') {\r
                                                continue;\r
@@ -202,7 +203,7 @@ class wsHTML5SeoPage
        public function getURL()\r
        {\r
                if (null === $this->url) {\r
-                       return $this->page . '-' . CubeIT_Text::str2URL($this->title) . '.html';\r
+                       return $this->page . '-' . CubeIT_Text::str2URL(CubeIT_Text::removeAccents($this->title)) . '.html';\r
                }\r
                return $this->url;\r
        }\r