resolved conflicts

This commit is contained in:
Logsol 2013-07-10 12:19:33 +02:00
commit 4bb0f353a2
4 changed files with 37 additions and 64 deletions

View file

@ -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);