Permalink
Browse files

OpenSearch now use forum_link($forum_url['opensearch']).

  • Loading branch information...
1 parent b0454e8 commit cf1e3223afb88eb7ee75308cbf5e9462501057f7 @dimkalinux dimkalinux committed Feb 19, 2012
View
@@ -108,7 +108,7 @@
if ($forum_user['g_read_board'] == '1' && $forum_user['g_search'] == '1')
{
$forum_head['search'] = '<link rel="search" type="text/html" href="'.forum_link($forum_url['search']).'" title="'.$lang_common['Search'].'" />';
- $forum_head['opensearch'] = '<link rel="search" type="application/opensearchdescription+xml" href="'.forum_link('misc.php?action=opensearch').'" title="'.forum_htmlencode($forum_config['o_board_title']).'" />';
+ $forum_head['opensearch'] = '<link rel="search" type="application/opensearchdescription+xml" href="'.forum_link($forum_url['opensearch']).'" title="'.forum_htmlencode($forum_config['o_board_title']).'" />';
}
$forum_head['author'] = '<link rel="author" type="text/html" href="'.forum_link($forum_url['users']).'" title="'.$lang_common['User list'].'" />';
@@ -38,6 +38,7 @@
'mark_forum_read' => 'misc.php?action=markforumread&amp;fid=$1&amp;csrf_token=$2',
'new_topic' => 'post.php?fid=$1',
'new_reply' => 'post.php?tid=$1',
+ 'opensearch' => 'misc.php?action=opensearch',
'post' => 'viewtopic.php?pid=$1#p$1',
'profile_about' => 'profile.php?section=about&amp;id=$1',
'profile_identity' => 'profile.php?section=identity&amp;id=$1',
@@ -40,6 +40,7 @@
'mark_forum_read' => 'mark-forum$1-read-$2.html',
'new_topic' => 'new-topic$1.html',
'new_reply' => 'new-reply$1.html',
+ 'opensearch' => 'misc.php?action=opensearch',
'post' => 'post$1.html#p$1',
'profile_about' => 'user$1-about.html',
'profile_identity' => 'user$1-identity.html',
@@ -41,6 +41,7 @@
'mark_forum_read' => 'mark-forum$1-read-$2.html',
'new_topic' => 'new-topic$1.html',
'new_reply' => 'new-reply$1.html',
+ 'opensearch' => 'misc.php?action=opensearch',
'post' => 'post$1.html#p$1',
'profile_about' => 'user$1-about.html',
'profile_identity' => 'user$1-identity.html',
@@ -38,6 +38,7 @@
'mark_forum_read' => 'mark/forum/$1/read/$2/',
'new_topic' => 'new/topic/$1/',
'new_reply' => 'new/reply/$1/',
+ 'opensearch' => 'misc.php?action=opensearch',
'post' => 'post/$1/#p$1',
'profile_about' => 'user/$1/about/',
'profile_identity' => 'user/$1/identity/',
@@ -39,6 +39,7 @@
'mark_forum_read' => 'mark/forum/$1/read/$2/',
'new_topic' => 'new/topic/$1/',
'new_reply' => 'new/reply/$1/',
+ 'opensearch' => 'misc.php?action=opensearch',
'post' => 'post/$1/#p$1',
'profile_about' => 'user/$1/about/',
'profile_identity' => 'user/$1/identity/',
View
@@ -152,7 +152,6 @@
redirect(forum_link($forum_url['forum'], array($fid, sef_friendly($forum_name))), $lang_misc['Mark forum read redirect']);
}
-
// OpenSearch plugin?
else if ($action == 'opensearch')
{
@@ -170,15 +169,15 @@
echo "\t".'<OutputEncoding>utf-8</OutputEncoding>'."\n";
echo "\t".'<Image width="16" height="16" type="image/x-icon">'.$base_url.'/favicon.ico</Image>'."\n";
echo "\t".'<Url type="text/html" method="get" template="'.$base_url.'/search.php?action=search&amp;source=opensearch&amp;keywords={searchTerms}"/>'."\n";
- echo "\t".'<Url type="application/opensearchdescription+xml" rel="self" template="'.$base_url.'/misc.php?action=opensearch"/>'."\n";
+ echo "\t".'<Url type="application/opensearchdescription+xml" rel="self" template="'.forum_link($forum_url['opensearch']).'"/>'."\n";
echo "\t".'<Contact>'.forum_htmlencode($forum_config['o_admin_email']).'</Contact>'."\n";
if ($forum_config['o_show_version'] == '1')
echo "\t".'<Attribution>PunBB '.$forum_config['o_cur_version'].'</Attribution>'."\n";
else
echo "\t".'<Attribution>PunBB</Attribution>'."\n";
- echo "\t".'<moz:SearchForm>'.$base_url.'/search.php</moz:SearchForm>'."\n";
+ echo "\t".'<moz:SearchForm>'.forum_link($forum_url['search']).'</moz:SearchForm>'."\n";
echo '</OpenSearchDescription>'."\n";
exit;

0 comments on commit cf1e322

Please sign in to comment.