diff --git a/serendipity_plugin_loginform/serendipity_plugin_loginform.php b/serendipity_plugin_loginform/serendipity_plugin_loginform.php index 5de5f3d7..2b21f957 100644 --- a/serendipity_plugin_loginform/serendipity_plugin_loginform.php +++ b/serendipity_plugin_loginform/serendipity_plugin_loginform.php @@ -5,13 +5,7 @@ if (IN_serendipity !== true) { die ("Don't hack!"); } -// Probe for a language include with constants. Still include defines later on, if some constants were missing -$probelang = dirname(__FILE__) . '/' . $serendipity['charset'] . 'lang_' . $serendipity['lang'] . '.inc.php'; -if (file_exists($probelang)) { - include $probelang; -} - -include dirname(__FILE__) . '/lang_en.inc.php'; +@serendipity_plugin_api::load_language(dirname(__FILE__)); class serendipity_plugin_loginform extends serendipity_plugin { function introspect(&$propbag) diff --git a/serendipity_plugin_photoblog/serendipity_plugin_photoblog.php b/serendipity_plugin_photoblog/serendipity_plugin_photoblog.php index e6d87f4c..df1fcf79 100644 --- a/serendipity_plugin_photoblog/serendipity_plugin_photoblog.php +++ b/serendipity_plugin_photoblog/serendipity_plugin_photoblog.php @@ -5,13 +5,7 @@ if (IN_serendipity !== true) { } -// Probe for a language include with constants. Still include defines later on, if some constants were missing -$probelang = dirname(__FILE__) . '/' . $serendipity['charset'] . 'lang_' . $serendipity['lang'] . '.inc.php'; -if (file_exists($probelang)) { - include $probelang; -} - -include dirname(__FILE__) . '/lang_en.inc.php'; +@serendipity_plugin_api::load_language(dirname(__FILE__)); class serendipity_plugin_photoblog extends serendipity_plugin { diff --git a/serendipity_plugin_pollbox/common.inc.php b/serendipity_plugin_pollbox/common.inc.php index aaa5dac1..6a052745 100644 --- a/serendipity_plugin_pollbox/common.inc.php +++ b/serendipity_plugin_pollbox/common.inc.php @@ -4,13 +4,7 @@ if (IN_serendipity !== true) { die ("Don't hack!"); } -// Probe for a language include with constants. Still include defines later on, if some constants were missing -$probelang = dirname(__FILE__) . '/' . $serendipity['charset'] . 'lang_' . $serendipity['lang'] . '.inc.php'; -if (file_exists($probelang)) { - include $probelang; -} - -include dirname(__FILE__) . '/lang_en.inc.php'; +@serendipity_plugin_api::load_language(dirname(__FILE__)); class serendipity_common_pollbox { var $poll = array(); diff --git a/serendipity_plugin_twitter/serendipity_event_twitter.php b/serendipity_plugin_twitter/serendipity_event_twitter.php index 8ab0c081..16de5e53 100644 --- a/serendipity_plugin_twitter/serendipity_event_twitter.php +++ b/serendipity_plugin_twitter/serendipity_event_twitter.php @@ -6,15 +6,9 @@ if (IN_serendipity !== true) { die ("Don't hack!"); } -// Probe for a language include with constants. Still include defines later on, if some constants were missing -$probelang = dirname(__FILE__) . '/' . $serendipity['charset'] . 'lang_' . $serendipity['lang'] . '.inc.php'; -if (file_exists($probelang)) { - include $probelang; -} +@serendipity_plugin_api::load_language(dirname(__FILE__)); -include dirname(__FILE__) . '/lang_en.inc.php'; - -include dirname(__FILE__) . '/plugin_version.inc.php'; +include_once dirname(__FILE__) . '/plugin_version.inc.php'; require_once dirname(__FILE__) . '/classes/Twitter.php'; require_once dirname(__FILE__) . '/classes/TwitterOAuthApi.php';