diff options
| author | vdigital <vdigital@piwigo.org> | 2009-06-30 21:24:55 +0000 |
|---|---|---|
| committer | vdigital <vdigital@piwigo.org> | 2009-06-30 21:24:55 +0000 |
| commit | 731cb8940c2fe220f2d1b5ea16abc3a594746b21 (patch) | |
| tree | 13ceb697ad342cfdd1b437fe916e218e49076673 /plugins/language_switch/main.inc.php | |
| parent | 73680f6348954359cef534cf5fc7e7a21c0b7de4 (diff) | |
merge r3477 from branch 2.0 to trunk
Bug 964 fixed and more
+ ?&lang=en_UK" => ?lang=en_UK"
+ =&lang=en_UK" => &lang=en_UK"
+ Works for any combinations of
$conf['question_mark_in_urls']
$conf['php_extension_in_urls']
=> BUT force a return to home in some cases.
+ Full technical code review
git-svn-id: http://piwigo.org/svn/trunk@3479 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'plugins/language_switch/main.inc.php')
| -rw-r--r-- | plugins/language_switch/main.inc.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/plugins/language_switch/main.inc.php b/plugins/language_switch/main.inc.php index d81ec050e..c7bd1118c 100644 --- a/plugins/language_switch/main.inc.php +++ b/plugins/language_switch/main.inc.php @@ -23,7 +23,7 @@ /* Plugin Name: Language Switch -Version: 2.0.2a +Version: 2.0.2b Description: Switch to another language from flags on your gallery home page. Plugin URI: http://piwigo.org/ext/extension_view.php?eid=123 Author: Piwigo team @@ -31,6 +31,7 @@ Author URI: http://piwigo.org */ include_once(PHPWG_PLUGINS_PATH.'language_switch/language_switch.inc.php'); -add_event_handler('loading_lang', 'language_controler::_switch', 5 ); -add_event_handler('loc_end_index', 'language_controler::_flags', 95 ); +$language_controler = new language_controler(); +add_event_handler('loading_lang', array(&$language_controler, '_switch'), 5 ); +add_event_handler('loc_end_index', array(&$language_controler, '_flags'), 95 ); ?>
\ No newline at end of file |