From 2a244be9ac61ae0adbdc4d0805c0c784a102da4c Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Wed, 28 Mar 2012 06:05:54 -0400 Subject: [PATCH 1/2] Merge branch 'master', remote-tracking branch 'remotes/upstream/master' * remotes/upstream/master: filer: replace "file as" prompt with combobox opened in fancybox filer: info() on item filed template: field_combobox * master: From 3d5e711780391fece27af1aaf915b81aca7536fe Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Wed, 28 Mar 2012 06:20:13 -0400 Subject: [PATCH 2/2] WITH is going on? Signed-off-by: Simon L'nu --- view/theme/dispy-dark/theme.php | 3 ++- view/theme/dispy/theme.php | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/view/theme/dispy-dark/theme.php b/view/theme/dispy-dark/theme.php index 372757752a..f06a97a5f1 100644 --- a/view/theme/dispy-dark/theme.php +++ b/view/theme/dispy-dark/theme.php @@ -157,7 +157,8 @@ function dispydark_community_info() { } // use our 'default.php' instead of the system-wide one -$a->page['template'] = "theme/dispy-dark/default"; +$theme_name = 'dispy-dark'; +//$a->page['template'] = "theme/dispy-dark/default"; // aside on profile page if ($a->argv[0] === "profile") { diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php index 190872d01e..15e54f7e21 100644 --- a/view/theme/dispy/theme.php +++ b/view/theme/dispy/theme.php @@ -157,7 +157,8 @@ function dispy_community_info() { } // use our 'default.php' instead of the system-wide one -$a->page['template'] = "theme/dispy-dark/default"; +$theme_name = 'dispy'; +//$a->page['template'] = "theme/dispy/default"; // aside on profile page if ($a->argv[0] === "profile") {