Changeset 1de0187a18dcbe504b456f6a4c6267d1878f062a

Show
Ignore:
Timestamp:
01/28/12 20:58:51 (4 months ago)
Author:
Xemle <xemle@phtagr.org>
Children:
0736ab3ac681bfd827d0973122d3a48e4b39594e
Parents:
b243ec7e35d1927db9132cdb0c1f9473054612d2
git-committer:
Xemle <xemle@phtagr.org> / 2012-01-28T20:58:51Z+0100
Message:

Fix default options for users

Files:
5 modified

Legend:

Unmodified
Added
Removed

  • Controller/AppController.php

    rf52b4cb r1de0187  
    109109      $user = $this->getUser(); 
    110110    } 
    111     $this->params['options'] = $this->Option->getOptions($user); 
     111    $this->request->params['options'] = $this->Option->getOptions($user); 
    112112    $this->set('currentUser', $user); 
    113113 

  • Controller/CommentsController.php

    ree4c2b7f r1de0187  
    104104      $this->request->data['Comment']['media_id'] = $mediaId; 
    105105      $this->request->data['Comment']['date'] = date("Y-m-d H:i:s", time()); 
    106       uses('Sanitize'); 
     106      App::uses('Sanitize', 'Utility'); 
    107107      $this->request->data['Comment']['text'] = Sanitize::html($this->request->data['Comment']['text']); 
    108108      if (($auth & COMMENT_AUTH_NAME) == 0) { 

  • Model/Option.php

    rbbc826a r1de0187  
    3939      if (strlen($name) > 2 && substr($name, -2) == '[]') { 
    4040        $options[] = $default[$this->name]; 
    41       } else if ($ownOptions && in_array($name, $ownOptions)) { 
     41      } else if ($ownOptions && !in_array($name, $ownOptions)) { 
    4242        $options[] = $default[$this->name]; 
    4343      } 

  • View/Elements/comment.ctp

    ree4c2b7f r1de0187  
    1616    $name = $this->Html->link($comment['name'], $comment['url']); 
    1717  }   
    18   $this->Time = $this->Html->tag('span', $this->Time->timeAgoInWords($comment['date']), array('class' => 'date')); 
    19   __("%s said %s", $name, $this->Time); 
     18  $time = $this->Html->tag('span', $this->Time->timeAgoInWords($comment['date']), array('class' => 'date')); 
     19  __("%s said %s", $name, $time); 
    2020?> 
    2121<?php 

  • View/Helper/OptionHelper.php

    r1a41cea r1de0187  
    2929  /** Intitialize the options */ 
    3030  function beforeRender() { 
    31     if (isset($this->params['options'])) { 
    32       $this->options = $this->params['options']; 
     31    if (isset($this->request->params['options'])) { 
     32      $this->options = $this->request->params['options']; 
    3333    } 
    3434  }