aboutsummaryrefslogtreecommitdiff
path: root/engine/lib/admin.php
diff options
context:
space:
mode:
authorSem <sembrestels@riseup.net>2012-07-01 23:31:08 +0200
committerSem <sembrestels@riseup.net>2012-07-01 23:31:08 +0200
commitea0140d87534c3b10e489d13a1449ebb79da832d (patch)
tree85667ae651bc5cc9f0ea01c6f3871bbdee36a469 /engine/lib/admin.php
parent157117475338bcaab5fc3453ec54250343da595c (diff)
parent671f9ba4e1b1972d8eaf22acfb626fa2c85af0f2 (diff)
downloadelgg-ea0140d87534c3b10e489d13a1449ebb79da832d.tar.gz
elgg-ea0140d87534c3b10e489d13a1449ebb79da832d.tar.bz2
Merge branch 'lorea-preprod'
Diffstat (limited to 'engine/lib/admin.php')
-rw-r--r--engine/lib/admin.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/engine/lib/admin.php b/engine/lib/admin.php
index 928101fc5..b65d98c95 100644
--- a/engine/lib/admin.php
+++ b/engine/lib/admin.php
@@ -244,6 +244,7 @@ function admin_init() {
elgg_register_action('profile/fields/delete', '', 'admin');
elgg_register_action('profile/fields/reorder', '', 'admin');
+ elgg_register_simplecache_view('css/admin');
elgg_register_simplecache_view('js/admin');
$url = elgg_get_simplecache_url('js', 'admin');
elgg_register_js('elgg.admin', $url);
@@ -571,7 +572,7 @@ function admin_markdown_page_handler($pages) {
if (!$plugin) {
$error = elgg_echo('admin:plugins:markdown:unknown_plugin');
$body = elgg_view_layout('admin', array('content' => $error, 'title' => $error));
- echo elgg_view_page($title, $body, 'admin');
+ echo elgg_view_page($error, $body, 'admin');
return true;
}