Merge branch 'master' into production

Conflicts: DCTUIKit.xcodeproj/project.pbxproj
danielctull · May 18, 2011 · d0d371a · d0d371a
2 parents 5dd1d50 + a6b5171
commit d0d371a
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/Core Data Based/UIViewController+DCTCoreDataViewController.m b/Core Data Based/UIViewController+DCTCoreDataViewController.m
@@ -35,7 +35,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  */
 
 #import "UIViewController+DCTCoreDataViewController.h"
-
+#import "UIResponder+DCTNextResponderExtensions.h"
 
 @implementation UIViewController (DCTCoreDataViewController)
 
@@ -56,7 +56,8 @@ - (void)dct_presentModalCoreDataViewController:(UIViewController<DCTCoreDataView
 		viewController.managedObjectContext = coreDataSelf.managedObjectContext;
 	}
 
-	[self presentModalViewController:viewController animated:animated];
+	UIViewController *vc = [self dct_furthestResponderOfClass:[UIViewController class]];
+	[vc presentModalViewController:viewController animated:animated];
 }
 
 - (void)dct_presentModalNavigationControllerWithRootCoreDataViewController:(UIViewController<DCTCoreDataViewControllerProtocol> *)viewController animated:(BOOL)animated {
@@ -68,7 +69,11 @@ - (void)dct_presentModalNavigationControllerWithRootCoreDataViewController:(UIVi
 
 	UINavigationController *nav = [[UINavigationController alloc] initWithRootViewController:viewController];
 
-	[self presentModalViewController:nav animated:animated];
+	UINavigationController *viewControllersNav = viewController.navigationController;
+	if ((viewControllersNav)) nav.navigationBar.tintColor = viewControllersNav.navigationBar.tintColor;
+
+	UIViewController *vc = [self dct_furthestResponderOfClass:[UIViewController class]];
+	[vc presentModalViewController:nav animated:animated];
 	[nav release];
 }