Multibyte PagePath (URL) support

concretecms · Jul 3, 2014 · 0d1b592 · 0d1b592
1 parent 6b82fea
commit 0d1b592
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/web/concrete/core/Http/Request.php b/web/concrete/core/Http/Request.php
@@ -51,7 +51,8 @@ public static function getInstance() {
 	 * Returns the full path for a request
 	 */
 	public function getPath() {
-		$path = '/' . trim($this->getPathInfo(), '/');
+	    $pathInfo = rawurldecode($this->getPathInfo());
+		$path = '/' . trim($pathInfo, '/');
 		return ($path == '/') ? '' : $path;
 	}
 

diff --git a/web/concrete/core/Page/Page.php b/web/concrete/core/Page/Page.php
@@ -904,7 +904,7 @@ function getCollectionCheckedOutUserID() {
      * @return string
      */
     function getCollectionPath() {
-        return $this->cPath;
+		return self::getEncodePath($this->cPath);
     }
 
     /**
@@ -920,6 +920,24 @@ public function getCollectionPathObject()
         return $path;
     }
 
+	/**
+	 * Returns the urlencode path for a page from path string
+	 * @param string $path
+	 * @return string $path
+	 */	
+	public static function getEncodePath($path){
+	    if(mb_strpos($path,"/") !== false){
+	      $path = explode("/",$path);
+	      $path = array_map("rawurlencode",$path);
+	      $newPath = implode("/",$path);
+	    }else if(is_null($path)){
+          $newPath = NULL;
+	    }else{
+	      $newPath = rawurlencode($path);
+	    } 
+	    return str_replace('%21','!',$newPath);
+	}
+
     /**
      * Adds a non-canonical page path to the current page.
      */
@@ -995,7 +1013,7 @@ public function getCollectionLink($appendBaseURL = false, $ignoreUrlRewriting =
     public static function getCollectionPathFromID($cID) {
         $db = Loader::db();
         $path = $db->GetOne("select cPath from PagePaths inner join CollectionVersions on (PagePaths.cID = CollectionVersions.cID and CollectionVersions.cvIsApproved = 1) where PagePaths.cID = ? order by PagePaths.ppIsCanonical desc", array($cID));
-        return $path;
+        return self::getEncodePath($path);
     }
 
     /**