summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEarl Miles2009-06-01 23:12:22 (GMT)
committer Earl Miles2009-06-01 23:12:22 (GMT)
commit116233f4d1facac0eb9fe46ee41d79edea703707 (patch)
treec9ff3036b013b1dbbf31077f12d272458ffc4eae
parent0f4afdf3e6b73a04d47e4db38277fc2b0a8c96d6 (diff)
#419226 by kelvincool: Respect admin theme during views ajax operations.
-rw-r--r--CHANGELOG.txt3
-rw-r--r--includes/ajax.inc7
2 files changed, 10 insertions, 0 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index a3772b5..9050595 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,6 +1,9 @@
CHANGELOG for Views 2 for Drupal 6
Views 2.x
+ Bugs fixed:
+ o #419226 by kelvincool: Respect admin theme during views ajax operations.
+
Other changes:
o #298616: Add argument for node updated time similar to node created time.
o #325607 by bangpound: Automatically sort exports from bulk export.
diff --git a/includes/ajax.inc b/includes/ajax.inc
index 75ffdbe..2193c76 100644
--- a/includes/ajax.inc
+++ b/includes/ajax.inc
@@ -27,6 +27,13 @@ function views_ajax() {
$object->status = FALSE;
$object->display = '';
+ $arg = explode('/', $_REQUEST['view_path']);
+
+ if ($arg[0] == 'admin' || (variable_get('node_admin_theme', '0') && $arg[0] == 'node' && ($arg[1] == 'add' || $arg[2] == 'edit'))) {
+ global $custom_theme;
+ $custom_theme = variable_get('admin_theme', '0');
+ drupal_add_css(drupal_get_path('module', 'system') .'/admin.css', 'module');
+ }
// Load the view.
if ($view = views_get_view($name)) {
if ($view->access($display_id)) {