------------------------------------------------------------
revno: 1079
committer: Roger Martin <[email protected]>
branch nick: aikiframework
timestamp: Mon 2012-02-06 21:24:06 +0100
message:
corrected ending double slashes in .htaccess file
modified:
assets/apps/installer/library.php
--
lp:aikiframework
https://code.launchpad.net/~aikiframework-devel/aikiframework/trunk
Your team Aiki Framework Developers is subscribed to branch lp:aikiframework.
To unsubscribe from this branch go to
https://code.launchpad.net/~aikiframework-devel/aikiframework/trunk/+edit-subscription
=== modified file 'assets/apps/installer/library.php'
--- assets/apps/installer/library.php 2012-02-02 21:09:33 +0000
+++ assets/apps/installer/library.php 2012-02-06 20:24:06 +0000
@@ -152,9 +152,9 @@
}
-function clean_url($url){
+function clean_url($url, $ending=true){
$top= strpos( $url, "/assets/apps/installer");
- return ( $top ? substr($url,0,$top) ."/" : $url . "/");
+ return ( $top ? substr($url,0,$top): $url) . ( $ending ? "/" : "");
}
@@ -204,7 +204,7 @@
if ( $htaccess_file == false ){
return false;
}
- return str_replace( "@AIKI_REWRITE_BASE@", clean_url($_SERVER["REQUEST_URI"]), $htaccess_file);
+ return str_replace( "@AIKI_REWRITE_BASE@", clean_url($_SERVER["REQUEST_URI"], false), $htaccess_file);
}
_______________________________________________
Mailing list: https://launchpad.net/~aikiframework-devel
Post to : [email protected]
Unsubscribe : https://launchpad.net/~aikiframework-devel
More help : https://help.launchpad.net/ListHelp
