Changeset 13003
- Timestamp:
- 11/14/08 12:44:29 (1 year ago)
- Files:
-
- plugins/sfDynamicCMSPlugin/branches/1.0/lib/model/plugin/PluginsfDynamicCmsNavPeer.php (modified) (1 diff)
- plugins/sfDynamicCMSPlugin/branches/1.0/modules/sfDynamicCMSAdmin/lib/BasesfDynamicCMSAdminActions.class.php (modified) (1 diff)
- plugins/sfDynamicCMSPlugin/branches/1.0/modules/sfDynamicCMSAdmin/templates/_flash_message.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
plugins/sfDynamicCMSPlugin/branches/1.0/lib/model/plugin/PluginsfDynamicCmsNavPeer.php
r12313 r13003 5 5 public static function retrieveCurrentNav($application=null,$culture=null) 6 6 { 7 if ($application===null) $application= SF_APP;7 if ($application===null) $application=sfConfig::get('sf_app'); 8 8 //if ($culture==null) $culture=sfContext::getInstance()->getRequest()->getParameter('sf_culture', null); 9 9 $c=new Criteria(); plugins/sfDynamicCMSPlugin/branches/1.0/modules/sfDynamicCMSAdmin/lib/BasesfDynamicCMSAdminActions.class.php
r12947 r13003 704 704 protected function checkActionCredential($action, $mode='forward_index') 705 705 { 706 if (sfConfig::has('app_sfDynamicCMS_dev_credentials') && $this->getUser()->hasCredential(sfConfig::get('app_sfDynamicCMS_dev_credentials') ) ) 707 { 708 return true; 709 } 710 706 711 if(!$this->permitted_actions) $this->permitted_actions=$this->getPermittedActions(); 707 712 plugins/sfDynamicCMSPlugin/branches/1.0/modules/sfDynamicCMSAdmin/templates/_flash_message.php
r12947 r13003 3 3 if(sfDynamicCMSTools::getSymfonyBranch()=='1.0') 4 4 { 5 if ($sf_request->hasErrors() || $sf_flash->has('error'))5 if ($sf_request->hasErrors() || isset($error)) 6 6 { 7 7 $error=$sf_flash->get('error');

