Development

Changeset 8912

You must first sign up to be able to contribute.

Changeset 8912

Show
Ignore:
Timestamp:
05/12/08 03:48:53 (5 days ago)
Author:
Jonathan.Wage
Message:

Misc. fixes.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • plugins/sfDoctrineSimpleCMSPlugin/trunk/lib/helper/sfSimpleCMSHelper.php

    r4950 r8912  
    8181                        Element.hide(\'edit_'.$slot.'\'); 
    8282                       '.visual_effect('highlight', 'slot_'.$slot), 
    83       '409'       => 'Element.show(\'locking_'.$slot.'\'); 
     83      '409'         => 'Element.show(\'locking_'.$slot.'\'); 
    8484                        var affected = document.getElementsByClassName(\'user-name\'); 
    8585                        for (var i = 0; i < affected.length; i++) 

  • plugins/sfDoctrineSimpleCMSPlugin/trunk/lib/model/doctrine/PluginsfSimpleCMSPage.class.php

    r4950 r8912  
    1616 * @author  Magnus Nordlander, smiling plants <magnus@smilingplants.com> 
    1717 */ 
    18 class PluginsfSimpleCMSPage extends BasesfSimpleCMSPage 
     18abstract class PluginsfSimpleCMSPage extends BasesfSimpleCMSPage 
    1919{ 
    2020  protected $localizations = null, 

  • plugins/sfDoctrineSimpleCMSPlugin/trunk/lib/model/doctrine/PluginsfSimpleCMSSlot.class.php

    r4950 r8912  
    1616 * @author  Magnus Nordlander, smiling plants <magnus@smilingplants.com> 
    1717 */ 
    18 class PluginsfSimpleCMSSlot extends BasesfSimpleCMSSlot 
     18abstract class PluginsfSimpleCMSSlot extends BasesfSimpleCMSSlot 
    1919{ 
    2020 

  • plugins/sfDoctrineSimpleCMSPlugin/trunk/modules/sfSimpleCMS/lib/BasesfSimpleCMSActions.class.php

    r8775 r8912  
    7878      $this->checkEditorCredential(); 
    7979      $page = Doctrine::getTable('sfSimpleCMSPage')->findBySlug($this->getRequestParameter('slug', sfConfig::get('app_sfSimpleCMS_default_page', 'home')), $culture); 
    80       if ($this->getUser()->getGuardUser() && $page->isLockedForUserId($this->getUser()->getGuardUser()->id)) 
     80      if ($this->getUser()->isAuthenticated() && $page->isLockedForUserId($this->getUser()->getGuardUser()->id)) 
    8181      { 
    8282        $this->getRequest()->setAttribute('lockedPage', $page); 
    …… 
    211211      $this->forward404Unless($page); 
    212212       
    213       if ($page->isLockedForUserId($this->getUser()->getGuardUser()->id)) 
     213      if ($this->getUser()->isAuthenticated() && $page->isLockedForUserId($this->getUser()->getGuardUser()->id)) 
    214214      { 
    215215        throw new Exception('This page is locked by ' . $page->lockingUser); 
    …… 
    263263    $this->forward404Unless($page); 
    264264     
    265     if ($page->isLockedForUserId($this->getUser()->getGuardUser()->id)) 
     265    if ($this->getUser()->isAuthenticated() && $page->isLockedForUserId($this->getUser()->getGuardUser()->id)) 
    266266    { 
    267267      throw new Exception('This page is locked by ' . $page->lockingUser); 
    …… 
    308308    if ($this->getUser()->isAuthenticated()) 
    309309    { 
    310       if ($page->isLockedForUserId($this->getUser()->getGuardUser()->id)) 
     310      if ($this->getUser()->isAuthenticated() && $page->isLockedForUserId($this->getUser()->getGuardUser()->id)) 
    311311      { 
    312312        throw new Exception('This page is locked by ' . $page->lockingUser); 

  • plugins/sfDoctrineSimpleCMSPlugin/trunk/modules/sfSimpleCMS/lib/BasesfSimpleCMSComponents.class.php

    r8775 r8912  
    9292    $this->culture = $culture; 
    9393    $this->getRequest()->setAttribute('culture', $culture); 
    94     $this->templatePath = sfLoader::getTemplatePath('sfSimpleCMS', $this->page->getTemplate().'Template.php'); 
     94    $this->templatePath = sfProjectConfiguration::getActive()->getTemplatePath('sfSimpleCMS', $this->page->getTemplate().'Template.php'); 
    9595    sfConfig::set('app_sfSimpleCMS_disable_editor_toolbar', true); 
    9696  }