From b51d236437810634ff22d3cd3897fcdc7b3fd735 Mon Sep 17 00:00:00 2001
From: szk11001 <salman.kaleem@uconn.edu>
Date: Mon, 12 Oct 2015 11:18:31 -0400
Subject: [PATCH 1/2] Check if 404 is from a private page

---
 404.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/404.php b/404.php
index 6053940..c9edda5 100755
--- a/404.php
+++ b/404.php
@@ -5,6 +5,13 @@
  * @package cornerstone
  */
 get_header(); ?>
+<?php
+$private = get_post_meta(get_queried_object()->ID, 'uc-private', true);
+if($private == 'admins' || $private == 'users' || $private == 'list' || $private == 'netids'){
+	$private = true;
+	echo 'This is a private page';
+}
+?>
 <div id="error404">
 	<div class="row">
 		<div class="col-sm-12">
@@ -24,7 +31,7 @@
 									</div>
 									<div class="col-sm-6">
 										<ul>
-										<?php 
+										<?php
 										if (wp_get_nav_menu_object('404')){
 											$defaults = array(
 												'menu'			=> '404',

From debfcd4a8554f3dedb621526dcaeb8c8325a3548 Mon Sep 17 00:00:00 2001
From: szk11001 <salman.kaleem@uconn.edu>
Date: Mon, 12 Oct 2015 13:39:09 -0400
Subject: [PATCH 2/2] Disable left nav if megamenu is active

---
 inc/submenu-check.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/inc/submenu-check.php b/inc/submenu-check.php
index f7d36f0..e3dee4e 100644
--- a/inc/submenu-check.php
+++ b/inc/submenu-check.php
@@ -16,12 +16,12 @@
 		foreach($menu_items as $key => $menu_item) {
 			while(in_array($menu_item->menu_item_parent, $stack) && $menu_item->menu_item_parent != array_pop($stack)) {
 				$level--;
-			}   
+			}
 			$level++;
 			$stack[] = $menu_item->menu_item_parent;
 			$stack[] = $menu_item->ID;
 			$menu_items[$key]->level = $level;
-			
+
 			if($menu_item->menu_item_parent == $current_id && $level > 2 || $menu_item->ID == $current_id && $level > 2 && $navoption1 == 'drop'){
 				$has_sub_menu = true;
 			}
@@ -29,7 +29,8 @@
 	}
 	//print_r($menu_items);
 }
-if($has_sub_menu){
+include_once( ABSPATH . 'wp-admin/includes/plugin.php' );
+if(!is_plugin_active( 'megamenu/megamenu.php' ) && $has_sub_menu){
 ?>
 <div class="row">
 	<div class="col-sm-3">