Merge remote-tracking branch 'upstream/develop' into dev_local

pydio · Nov 19, 2014 · bebf825 · bebf825
2 parents 04bf3ef + 67c7e86
commit bebf825
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/core/src/plugins/authfront.cas/CAS/Client.php b/core/src/plugins/authfront.cas/CAS/Client.php
@@ -3500,6 +3500,7 @@ public function getURL()
             $new_request_uri = $request_uri[0];
             $str_pattern = '/index|plugins|dashboard|settings|welcome|ws-(.*)$/';
             $new_request_uri = preg_replace($str_pattern,'',$new_request_uri);
+            if(!(strcmp($new_request_uri, "/") === 0))
                 $new_request_uri = rtrim($new_request_uri, "/");
             $final_uri		.= $new_request_uri;
             //-------------------------------------------------------------------