[Phpbbkb-checkins] SF.net SVN: phpbbkb: [53] main/trunk
Status: Alpha
Brought to you by:
markthedaemon
From: <mar...@us...> - 2007-02-15 01:04:17
|
Revision: 53 http://svn.sourceforge.net/phpbbkb/?rev=53&view=rev Author: markthedaemon Date: 2007-02-14 17:04:18 -0800 (Wed, 14 Feb 2007) Log Message: ----------- A fix for bug #2. Don't really like how its implemented but meh :P. Probably need a better solution by the time we get to the betas. Modified Paths: -------------- main/trunk/kb/functions.php main/trunk/language/lang_english/lang_kb.php Modified: main/trunk/kb/functions.php =================================================================== --- main/trunk/kb/functions.php 2007-02-15 00:48:38 UTC (rev 52) +++ main/trunk/kb/functions.php 2007-02-15 01:04:18 UTC (rev 53) @@ -71,7 +71,7 @@ // Viewing an article if($id_ary[2] == 0) { - $navigation = '<span class="nav"> <a href="' . append_sid('kb.' . $phpEx) . '" class="nav">' . $lang['kb_main'] . '</a> -> <a class="nav" href="' . append_sid('kb.' . $phpEx.'?pid=view_cat&id=' . $id_ary[0]) . '">' . $id_ary[1] .'</a> -> <a class="nav" href="' . append_sid('kb.' . $phpEx.'?pid=view_article&id=' . $id_ary[3]) . '&cid=' . $id_ary[0] . '">' . $id_ary[4] .'</a></span>'; + $navigation = '<span class="nav"> <a href="' . append_sid('kb.' . $phpEx) . '" class="nav">' . $lang['kb_main'] . '</a> -> <a class="nav" href="' . append_sid('kb.' . $phpEx.'?pid=view_cat&id=' . $id_ary[0]) . '">' . $id_ary[1] .'</a> -> <a class="nav" href="' . append_sid('kb.' . $phpEx.'?pid=view_article&cid=' . $cat . '&id=' . $id_ary[3]) . '&cid=' . $id_ary[0] . '">' . $id_ary[4] .'</a></span>'; } else { @@ -84,7 +84,7 @@ } $maincat = $db->sql_fetchrow($result); - $navigation = '<span class="nav"> <a href="' . append_sid('kb.' . $phpEx) . '" class="nav">' . $lang['kb_main'] . '</a> -> <a class="nav" href="' . append_sid('kb.' . $phpEx.'?pid=view_cat&id=' . $id_ary[2]) . '">' . $maincat['cat_title'] .'</a> -> <a class="nav" href="' . append_sid('kb.' . $phpEx.'?pid=view_cat&id=' . $id_ary[0]) . '">' . $id_ary[1] .'</a> -> <a class="nav" href="' . append_sid('kb.' . $phpEx.'?pid=view_article&id=' . $id_ary[3]) . '&cid=' . $id_ary[0] . '">' . $id_ary[4] .'</a></span>'; + $navigation = '<span class="nav"> <a href="' . append_sid('kb.' . $phpEx) . '" class="nav">' . $lang['kb_main'] . '</a> -> <a class="nav" href="' . append_sid('kb.' . $phpEx.'?pid=view_cat&id=' . $id_ary[2]) . '">' . $maincat['cat_title'] .'</a> -> <a class="nav" href="' . append_sid('kb.' . $phpEx.'?pid=view_cat&id=' . $id_ary[0]) . '">' . $id_ary[1] .'</a> -> <a class="nav" href="' . append_sid('kb.' . $phpEx.'?pid=view_article&cid=' . $cat . '&id=' . $id_ary[3]) . '&cid=' . $id_ary[0] . '">' . $id_ary[4] .'</a></span>'; } break; @@ -337,8 +337,9 @@ } } - $meta = '<meta http-equiv="refresh" content="3;url=' . append_sid('kb.' . $phpEx . '?pid=view_article&id=' . $article_id) . '>"'; - $return_message = $lang['kb_added'] . '<br /><br />' . sprintf($lang['kb_click_view_article'], '<a href="' . append_sid('kb.' . $phpEx . '?pid=view_article&id=' . $article_id) . '">', '</a>') . '<br /><br />' . sprintf($lang['kb_click_return_ucp'], '<a href="' . append_sid('kb.' . $phpEx . '?pid=ucp') . '">', '</a>'); + $meta = '<meta http-equiv="refresh" content="3;url=' . append_sid('kb.' . $phpEx . '?pid=view_article&cid=' . $cat . '&cid=' . $cat . '&id=' . $article_id) . '>"'; + $return_message = $lang['kb_added'] . '<br /><br />' . sprintf($lang['kb_click_view_article'], '<a href="' . append_sid('kb.' . $phpEx . '?pid=view_article&cid=' . $cat . '&cid=' . $cat . '&id=' . $article_id) . '">', '</a>') //. '<br /><br />' . sprintf($lang['kb_click_return_ucp'], '<a href="' . append_sid('kb.' . $phpEx . '?pid=ucp') . '">', '</a>') + ; } else { @@ -395,8 +396,8 @@ } // Message here somewhere - $meta = '<meta http-equiv="refresh" content="3;url=' . append_sid('kb.' . $phpEx . '?pid=view_article&id=' . $article_id) . '>"'; - $return_message = $lang['kb_edited'] . '<br /><br />' . sprintf($lang['kb_click_view_article'], '<a href="' . append_sid('kb.' . $phpEx . '?pid=view_article&id=' . $article_id) . '">', '</a>') . '<br /><br />' . sprintf($lang['kb_click_return_ucp'], '<a href="' . append_sid('kb.' . $phpEx . '?pid=ucp') . '">', '</a>'); + $meta = '<meta http-equiv="refresh" content="3;url=' . append_sid('kb.' . $phpEx . '?pid=view_article&cid=' . $cat . '&cid=' . $cat . '&id=' . $article_id) . '>"'; + $return_message = $lang['kb_edited'] . '<br /><br />' . sprintf($lang['kb_click_view_article'], '<a href="' . append_sid('kb.' . $phpEx . '?pid=view_article&cid=' . $cat . '&cid=' . $cat . '&id=' . $article_id) . '">', '</a>') . '<br /><br />' . sprintf($lang['kb_click_return_ucp'], '<a href="' . append_sid('kb.' . $phpEx . '?pid=ucp') . '">', '</a>'); } $template->assign_vars(array( @@ -849,8 +850,8 @@ } // Message - $meta = '<meta http-equiv="refresh" content="3;url=' . append_sid('kb.' . $phpEx . '?pid=view_article&id=' . $article_id) . '>"'; - $return_message = $lang['kb_deleted'] . '<br /><br />' . sprintf($lang['kb_click_view_article'], '<a href="' . append_sid('kb.' . $phpEx . '?pid=view_article&id=' . $article_id) . '">', '</a>') . '<br /><br />' . sprintf($lang['kb_click_return_ucp'], '<a href="' . append_sid('kb.' . $phpEx . '?pid=ucp') . '">', '</a>'); + $meta = '<meta http-equiv="refresh" content="3;url=' . append_sid('kb.' . $phpEx . '?pid=view_article&cid=' . $cat . '&id=' . $article_id) . '>"'; + $return_message = $lang['kb_deleted'] . '<br /><br />' . sprintf($lang['kb_click_view_article'], '<a href="' . append_sid('kb.' . $phpEx . '?pid=view_article&cid=' . $cat . '&id=' . $article_id) . '">', '</a>') . '<br /><br />' . sprintf($lang['kb_click_return_ucp'], '<a href="' . append_sid('kb.' . $phpEx . '?pid=ucp') . '">', '</a>'); $template->assign_vars(array( 'META' => $meta) Modified: main/trunk/language/lang_english/lang_kb.php =================================================================== --- main/trunk/language/lang_english/lang_kb.php 2007-02-15 00:48:38 UTC (rev 52) +++ main/trunk/language/lang_english/lang_kb.php 2007-02-15 01:04:18 UTC (rev 53) @@ -58,7 +58,7 @@ $lang['kb_deleted'] = "Your article has been deleted and is now nonexistant."; $lang['kb_edited'] = "Your article has been edited and is awaiting reapproval."; $lang['kb_click_view_article'] = "Click %shere%s to view you article."; // Change this later on, they can't view the article yet. -$lang['kb_click_return_ucp'] = "Click %shere%s to go back to the user control panel"; +//$lang['kb_click_return_ucp'] = "Click %shere%s to go back to the user control panel"; $lang['kb_posted_by'] = "This article was submitted by %s on %s, it was last updated on %s."; $lang['kb_confirm_deletearticle'] = "Are you sure you want to delete this article?"; $lang['kb_articlepreview'] = "Article Preview"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |