Commit 8aefc571 authored by chealer's avatar chealer

stop setting Smarty $cat_categorize, unused after r15071

parent d51c57f4
......@@ -19,16 +19,12 @@ $catobjperms = Perms::get( array( 'type' => $cat_type, 'object' => $cat_objid )
if ($prefs['feature_categories'] == 'y' && $catobjperms->modify_object_categories ) {
global $categlib; include_once('lib/categories/categlib.php');
$smarty->assign('cat_categorize', 'n');
if (isset($_REQUEST['import']) and isset($_REQUEST['categories'])) {
$_REQUEST["cat_categories"] = explode(',',$_REQUEST['categories']);
$_REQUEST["cat_categorize"] = 'on';
}
if ( isset($_REQUEST["cat_categorize"]) && $_REQUEST["cat_categorize"] == 'on' && ! (isset($_REQUEST["cat_clearall"]) && $_REQUEST["cat_clearall"] == 'on') ) {
$smarty->assign('cat_categorize', 'y');
} else {
if ( !isset($_REQUEST["cat_categorize"]) || $_REQUEST["cat_categorize"] != 'on' || (isset($_REQUEST["cat_clearall"]) && $_REQUEST["cat_clearall"] == 'on') ) {
$_REQUEST['cat_categories'] = NULL;
}
if ( $cat_type == 'wiki page' && $tikilib->get_approved_page($cat_objid) ) {
......
......@@ -18,11 +18,6 @@ $catobjperms = Perms::get( array( 'type' => $cat_type, 'object' => $cat_objid )
$smarty->assign('mandatory_category', '-1');
if ($prefs['feature_categories'] == 'y' && isset($cat_type) && isset($cat_objid)) {
global $categlib, $user; include_once ('lib/categories/categlib.php');
$smarty->assign('cat_categorize', 'n');
if (isset($_REQUEST["cat_categorize"]) && $_REQUEST["cat_categorize"] == 'on') {
$smarty->assign('cat_categorize', 'y');
}
if( ! isset( $cat_object_exists ) ) {
$cat_object_exists = (bool) $cat_objid;
......@@ -91,12 +86,4 @@ if ($prefs['feature_categories'] == 'y' && isset($cat_type) && isset($cat_objid)
if (!empty($cats))
$smarty->assign('catsdump', implode(',',$cats));
$smarty->assign_by_ref('categories', $categories);
// check if this page is categorized
if ($categlib->is_categorized($cat_type, $cat_objid)) {
$cat_categorize = 'y';
} else {
$cat_categorize = 'n';
}
$smarty->assign('cat_categorize', $cat_categorize);
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment