Merge pull request #191 from inalto/master

nginx config fixes and small fixes to avoid deprecated warnings

Author: Zavy86

docker/development.nginx.conf

@@ -21,8 +21,18 @@ http {
         root   /var/www/html;
         index  index.php index.html index.htm;
 
+        location ~* \.(css|js|jpg|jpeg|png|gif|ico|svg)$ {
+            try_files $uri =404;
+            add_header Cache-Control "public, max-age=3600";
+        }
+        location ~* \.md$ {
+            return 301 /;
+        }
         location / {
-            try_files $uri $uri/ /index.php?$args;
+        if (!-e $request_filename){
+            rewrite ^/(.*)$ /index.php?doc=$1 last;
+        }
+        try_files $uri $uri/ =404;
         }
 
         location ~ \.php$ {
@@ -38,4 +48,3 @@ http {
         }
     }
 }
-

libraries/parsedown-extended-1.1.2-modified/ParsedownExtended.php

@@ -24,6 +24,8 @@ class ParsedownExtended extends DynamicParent
     public const ID_ATTRIBUTE_DEFAULT = 'toc';
     protected $tagToc = '[toc]';
 
+    protected $options;
+
     protected $contentsListArray = [];
     protected $contentsListString = '';
     protected $firstHeadLevel = 0;

libraries/parsedown-extra-0.8.1/ParsedownExtra.php

@@ -625,8 +625,8 @@ protected function processTag($elementMarkup) # recursive
         $DOMDocument = new DOMDocument;
 
         # http://stackoverflow.com/q/11309194/200145
-        $elementMarkup = mb_convert_encoding($elementMarkup, 'HTML-ENTITIES', 'UTF-8');
-
+        $elementMarkup = html_entity_decode($elementMarkup, ENT_COMPAT | ENT_HTML5, 'UTF-8');
+    
         # http://stackoverflow.com/q/4879946/200145
         $DOMDocument->loadHTML($elementMarkup);
         $DOMDocument->removeChild($DOMDocument->doctype);