Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/2.5.x' into saas

Browse source
This commit is contained in:
Albert Santoni 2014-09-08 20:47:38 -04:00
commit 142060d600
5 changed files with 665 additions and 661 deletions
Download patch file Download diff file Expand all files Collapse all files

3
airtime_mvc/application/Bootstrap.php
View file

@ -198,7 +198,8 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
{
$front = Zend_Controller_Front::getInstance();
$router = $front->getRouter();
$front->setBaseUrl(Application_Common_OsPath::getBaseDir());
$router->addRoute(
'password-change',
new Zend_Controller_Router_Route('password-change/:user_id/:token', array(