aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2006-12-14 00:58:57 +0000
committerrvelices <rv-github@modusoptimus.com>2006-12-14 00:58:57 +0000
commitf7960e7e72ca913e1e67844dec6ff0d40de46d1b (patch)
tree678ca1a56753234b43b6ba65eb0b61fb7535787f /include
parent51e56e9c1f4952a7d8cb7533b62c2829c15df01e (diff)
- plugins admin menu appear now in the admin page menubar
- plugins are loaded immediately after loading the config (allow them to hack more of pwg like user init, template init etc...) - trigger event format_exif_data (for picture display only) git-svn-id: http://piwigo.org/svn/trunk@1655 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'include')
-rw-r--r--include/common.inc.php3
-rw-r--r--include/picture_metadata.inc.php1
2 files changed, 2 insertions, 2 deletions
diff --git a/include/common.inc.php b/include/common.inc.php
index 2b02e0cf8..c1ebc7f74 100644
--- a/include/common.inc.php
+++ b/include/common.inc.php
@@ -137,6 +137,7 @@ or die ( "Could not connect to database" );
// since basic gallery information is not available
//
load_conf_from_db();
+load_plugins();
include(PHPWG_ROOT_PATH.'include/user.inc.php');
@@ -158,8 +159,6 @@ if ($user['is_the_guest'])
// template instance
$template = new Template(PHPWG_ROOT_PATH.'template/'.$user['template'], $user['theme'] );
-load_plugins();
-
if ($conf['gallery_locked'])
{
$header_msgs[] = $lang['gallery_locked_message'];
diff --git a/include/picture_metadata.inc.php b/include/picture_metadata.inc.php
index 038737eb7..a661a09e9 100644
--- a/include/picture_metadata.inc.php
+++ b/include/picture_metadata.inc.php
@@ -41,6 +41,7 @@ if ($conf['show_exif'])
if ($exif = @read_exif_data($picture['current']['image_path']))
{
+ $exif = trigger_event('format_exif_data', $exif, $picture['current'] );
$template->assign_block_vars(
'metadata.headline',
array('TITLE' => 'EXIF Metadata')