resolved conflicts
This commit is contained in:
commit
4bb0f353a2
4 changed files with 37 additions and 64 deletions
|
@ -15,7 +15,8 @@ class PageController extends Katharsis_Controller_Abstract
|
|||
{
|
||||
$preview = true;
|
||||
}
|
||||
$url = substr($method, 0, -6);
|
||||
|
||||
$url = substr($method, 0, -6); // remove Action from urlAction
|
||||
|
||||
$pageId = $this->_page->getIdByUrl($url);
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue