@@ -160,10 +159,10 @@ function node_filter_form() {
$value=$filters[$type]['options'][$value];
}
if($i++){
$form['filters']['current'][]=array('#markup'=>t('<em>and</em> where <strong>%a</strong> is <strong>%b</strong>',array('%a'=>$filters[$type]['title'],'%b'=>$value)));
$form['filters']['current'][]=array('#markup'=>t('<em>and</em> where <strong>%type</strong> is <strong>%value</strong>',array('%type'=>$filters[$type]['title'],'%value'=>$value)));
}
else{
$form['filters']['current'][]=array('#markup'=>t('<strong>%a</strong> is <strong>%b</strong>',array('%a'=>$filters[$type]['title'],'%b'=>$value)));
$form['filters']['current'][]=array('#markup'=>t('<strong>%type</strong> is <strong>%value</strong>',array('%type'=>$filters[$type]['title'],'%value'=>$value)));
}
if(in_array($type,array('type','language'))){
// Remove the option if it is already being filtered on.
...
...
@@ -377,7 +376,7 @@ function node_admin_content($form_state) {
'#markup'=>theme('links',array(array('title'=>t('Add new content'),'href'=>'node/add')),array('class'=>array('action-links'))),
$this->assertRaw(t('<strong>%type</strong> is <strong>%value</strong>',array('%type'=>t('status'),'%value'=>t('published'))),t('The node administration listing is filtered by status.'));
$this->assertText($node1->title,t('Published node appears on the node administration listing.'));
$this->assertNoText($node2->title,t('Unpublished node does not appear on the node administration listing.'));
$this->assertRaw(t('<strong>%type</strong> is <strong>%value</strong>',array('%type'=>t('status'),'%value'=>t('published'))),t('The node administration listing is filtered by status.'));
$this->assertRaw(t('<strong>%type</strong> is <strong>%value</strong>',array('%type'=>t('type'),'%value'=>'Article')),t('The node administration listing is filtered by content type.'));
$this->assertText($node1->title,t('Article node appears on the node administration listing.'));
$this->assertNoText($node3->title,t('Page node does not appear on the node administration listing.'));