------------------------------------------------------------
revno: 1144
committer: Roger Martin <[email protected]>
branch nick: aikiframework
timestamp: Thu 2012-03-15 20:34:10 +0100
message:
fixed bug 956083 Error 404 stop working
modified:
libs/url.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 'libs/url.php'
--- libs/url.php 2012-03-08 21:49:01 +0000
+++ libs/url.php 2012-03-15 19:34:10 +0000
@@ -112,7 +112,7 @@
public function set_404(){
$this->url= array("error_404");
- $this->pretty="";
+ $this->pretty="error_404";
$this->url_count = count($this->url);
}
@@ -160,7 +160,7 @@
* @return boolean
*/
- public function match($displayString) {
+ public function match($displayString) {
if ($displayString) {
// a regular expression can contains a | character, that must be
@@ -188,12 +188,13 @@
}
// easy option
- if ( $displayUrl == "*"
+ if ( $displayUrl == "*"
|| ( $this->pretty == '' && $displayUrl == 'homepage' )
|| strpos($this->pretty,$displayUrl) === 0 ) {
return true;
}
+
//regular expression?
if ( strpos($displayUrl, "#") === 0 &&
preg_match('/^#.+#[Uims]*$/', $displayUrl) ) {
_______________________________________________
Mailing list: https://launchpad.net/~aikiframework-devel
Post to : [email protected]
Unsubscribe : https://launchpad.net/~aikiframework-devel
More help : https://help.launchpad.net/ListHelp
