diff options
| author | patdenice <patdenice@piwigo.org> | 2009-09-05 11:35:20 +0000 |
|---|---|---|
| committer | patdenice <patdenice@piwigo.org> | 2009-09-05 11:35:20 +0000 |
| commit | 203a8a33cfd0d29edc8370444943b3d7366de105 (patch) | |
| tree | fa209f6411175de8f3acf2364ea4d639f3925116 /admin/include | |
| parent | d39ce214bceac343844b067d0f00bb904d6af2b2 (diff) | |
merge r3716-3717 from trunk to branch 2.0
Allow to add description.txt file in language directory for plugin description.
Add multilingual descriptions for plugins.
git-svn-id: http://piwigo.org/svn/branches/2.0@3824 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'admin/include')
| -rw-r--r-- | admin/include/plugins.class.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/admin/include/plugins.class.php b/admin/include/plugins.class.php index 8972c1df0..fd1700447 100644 --- a/admin/include/plugins.class.php +++ b/admin/include/plugins.class.php @@ -213,7 +213,11 @@ DELETE FROM ' . PLUGINS_TABLE . ' WHERE id="' . $plugin_id . '"'; { $plugin['uri'] = trim($val[1]); } - if ( preg_match("|Description: (.*)|", $plg_data, $val) ) + if ($desc = load_language('description.txt', $path.'/', array('return' => true))) + { + $plugin['description'] = trim($desc); + } + elseif ( preg_match("|Description: (.*)|", $plg_data, $val) ) { $plugin['description'] = trim($val[1]); } |