Merge branch 'release/0.9.3'

getgrav · Oct 10, 2014 · c276457 · c276457
2 parents 00f6738 + 538fa23
commit c276457
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # ![](https://avatars1.githubusercontent.com/u/8237355?v=2&s=50) Grav
 
-Grav is a **Fast**, **Simple**, and **Flexible**, file-based Web-platform.  There is **Zero** installation required.  Just extract the ZIP archive, and you are already up and running.  It follows similar principals to other flat-file CMS platforms, but has a different design philosophy than most.
+Grav is a **Fast**, **Simple**, and **Flexible**, file-based Web-platform.  There is **Zero** installation required.  Just extract the ZIP archive, and you are already up and running.  It follows similar principals to other flat-file CMS platforms, but has a different design philosophy than most. Grav comes with a powerful **Package Management System** to allow for simple installation and upgrading of plugins and themes, as well as simple updating of Grav itself.
 
 The underlying architecture of Grav has been designed to use well-established and _best-in-class_ technologies, where applicable, to ensure that Grav is simple to use and easy to extend. Some of these key technologies include:
 

diff --git a/system/src/Grav/Common/GPM/Installer.php b/system/src/Grav/Common/GPM/Installer.php
@@ -143,6 +143,12 @@ public static function sophisticatedInstall($zip, $install_path, $tmp)
                 if (is_dir($path)) {
                     Folder::delete($path);
                     Folder::move($tmp . DS . $filename, $path);
+
+                    if ($fileinfo['basename'] == 'bin') {
+                        foreach (glob($path . DS . '*') as $file) {
+                            @chmod($file, 0755);
+                        }
+                    }
                 } else {
                     if (is_file($path)) {
                         @unlink($path);

diff --git a/system/src/Grav/Common/Markdown/MarkdownGravLinkTrait.php b/system/src/Grav/Common/Markdown/MarkdownGravLinkTrait.php
@@ -5,6 +5,7 @@
 use Grav\Common\Debugger;
 use Grav\Common\GravTrait;
 use Grav\Common\Page\Medium;
+use Grav\Common\Uri;
 
 /**
  * A trait to add some custom processing to the identifyLink() method in Parsedown and ParsedownExtra
@@ -97,7 +98,7 @@ protected function identifyLink($Excerpt)
                     }
                 } else {
                     // not a current page media file, see if it needs converting to relative
-                    $Excerpt['element']['attributes']['src'] = $this->convertUrl($url['path']);
+                    $Excerpt['element']['attributes']['src'] = $this->convertUrl(Uri::build_url($url));
                 }
             }
         }

diff --git a/system/src/Grav/Common/Uri.php b/system/src/Grav/Common/Uri.php
@@ -333,4 +333,23 @@ public function ip()
         return $ipaddress;
 
     }
+
+    /**
+     * The opposite of built-in PHP method parse_url()
+     *
+     * @param $parsed_url
+     * @return string
+     */
+    public static function build_url($parsed_url) {
+        $scheme   = isset($parsed_url['scheme']) ? $parsed_url['scheme'] . '://' : '';
+        $host     = isset($parsed_url['host']) ? $parsed_url['host'] : '';
+        $port     = isset($parsed_url['port']) ? ':' . $parsed_url['port'] : '';
+        $user     = isset($parsed_url['user']) ? $parsed_url['user'] : '';
+        $pass     = isset($parsed_url['pass']) ? ':' . $parsed_url['pass']  : '';
+        $pass     = ($user || $pass) ? "$pass@" : '';
+        $path     = isset($parsed_url['path']) ? $parsed_url['path'] : '';
+        $query    = isset($parsed_url['query']) ? '?' . $parsed_url['query'] : '';
+        $fragment = isset($parsed_url['fragment']) ? '#' . $parsed_url['fragment'] : '';
+        return "$scheme$user$pass$host$port$path$query$fragment";
+    }
 }