aboutsummaryrefslogtreecommitdiffstats
path: root/include/common.inc.php
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2007-10-02 05:42:22 +0000
committerrvelices <rv-github@modusoptimus.com>2007-10-02 05:42:22 +0000
commit530e3e6974f95be5a5cca823b33ec8f7562fbcf6 (patch)
tree7eb1cb1f5b66c90c8e032b33833a2c1c331ee496 /include/common.inc.php
parent58977351dd282cd14b53bbf04494acbddc185900 (diff)
- merge r 2117 from trunk (render_category_description and render_category_literal_description events refactoring)
- fix admin multiview plugin git-svn-id: http://piwigo.org/svn/branches/branch-1_7@2118 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'include/common.inc.php')
-rw-r--r--include/common.inc.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/include/common.inc.php b/include/common.inc.php
index 8a136bc4f..00e68e646 100644
--- a/include/common.inc.php
+++ b/include/common.inc.php
@@ -172,9 +172,9 @@ if ($user['is_the_guest'])
}
// template instance
-if
+if
(
- defined('IN_ADMIN') and IN_ADMIN and
+ defined('IN_ADMIN') and IN_ADMIN and
isset($user['admin_template']) and
isset($user['admin_theme'])
)
@@ -261,6 +261,8 @@ if (isset($conf['header_notes']))
}
// default event handlers
+add_event_handler('render_category_literal_description', 'render_category_literal_description');
+add_event_handler('render_category_description', 'render_category_description');
add_event_handler('render_comment_content', 'htmlspecialchars');
add_event_handler('render_comment_content', 'parse_comment_content');
add_event_handler('render_comment_author', 'strip_tags');