Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
This commit is contained in:
		@@ -201,7 +201,7 @@ class NewmessageAction extends Action
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    function showNoticeForm()
 | 
					    function showNoticeForm()
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
        $message_form = new MessageForm($this, $this->to, $this->content);
 | 
					        $message_form = new MessageForm($this, $this->other, $this->content);
 | 
				
			||||||
        $message_form->show();
 | 
					        $message_form->show();
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -255,7 +255,7 @@ class HTMLOutputter extends XMLOutputter
 | 
				
			|||||||
        foreach ($content as $value => $option) {
 | 
					        foreach ($content as $value => $option) {
 | 
				
			||||||
            if ($value == $selected) {
 | 
					            if ($value == $selected) {
 | 
				
			||||||
                $this->element('option', array('value' => $value,
 | 
					                $this->element('option', array('value' => $value,
 | 
				
			||||||
                                               'selected' => $value),
 | 
					                                               'selected' => 'selected'),
 | 
				
			||||||
                               $option);
 | 
					                               $option);
 | 
				
			||||||
            } else {
 | 
					            } else {
 | 
				
			||||||
                $this->element('option', array('value' => $value), $option);
 | 
					                $this->element('option', array('value' => $value), $option);
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user