svn: /pear2/sandbox/pear2.php.net/branches/LIVE/ src/PEAR2Web/Router.php
[email protected] (Brett Bieber)
| Newsgroups | php.pear.cvs,php.pear.core |
|---|---|
| Message-ID | <[email protected]> |
saltybeagle Fri, 16 Jul 2010 19:12:38 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=301336
Log:
Merge 404 fix from trunk
Changed paths:
_U pear2/sandbox/pear2.php.net/branches/LIVE/
U pear2/sandbox/pear2.php.net/branches/LIVE/src/PEAR2Web/Router.php
Property changes on: pear2/sandbox/pear2.php.net/branches/LIVE
___________________________________________________________________
Added: svn:mergeinfo
+ /pear2/sandbox/pear2.php.net/trunk:301301-301335
Modified: pear2/sandbox/pear2.php.net/branches/LIVE/src/PEAR2Web/Router.php
===================================================================
--- pear2/sandbox/pear2.php.net/branches/LIVE/src/PEAR2Web/Router.php 2010-07-16 18:50:34 UTC (rev 301335)
+++ pear2/sandbox/pear2.php.net/branches/LIVE/src/PEAR2Web/Router.php 2010-07-16 19:12:38 UTC (rev 301336)
@@ -93,6 +93,8 @@
$options['file'] = $matches['file'];
}
+ } else {
+ $options['view'] = '404';
}
return $options;