From c54f106c0b6a7b9b5069a2b1a66ba243ab902150 Mon Sep 17 00:00:00 2001 From: Onni Hakala Date: Tue, 3 Jan 2017 11:37:38 +0200 Subject: [PATCH 1/4] Fix changed polylang languages path --- PolylangHelperFunctions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PolylangHelperFunctions.php b/PolylangHelperFunctions.php index 37a7573..1e88de8 100644 --- a/PolylangHelperFunctions.php +++ b/PolylangHelperFunctions.php @@ -34,7 +34,7 @@ function pll_get_languages_list () { */ function pll_get_default_language_information($language_code) { global $polylang; - require(PLL_ADMIN_INC.'/languages.php'); + require(PLL_SETTINGS_INC.'/languages.php'); foreach ($languages as $language) { if ($language[0] == $language_code || $language[1] == $language_code) { $rtl = (count($language) > 3) && ($language[3] == 'rtl'); From 70b6485d565051af906319ff262852217a8611d8 Mon Sep 17 00:00:00 2001 From: Onni Hakala Date: Tue, 3 Jan 2017 11:38:21 +0200 Subject: [PATCH 2/4] Fix array so it works in php5 and php7 --- PolylangHelperFunctions.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/PolylangHelperFunctions.php b/PolylangHelperFunctions.php index 1e88de8..e7c3ffd 100644 --- a/PolylangHelperFunctions.php +++ b/PolylangHelperFunctions.php @@ -75,11 +75,11 @@ function pll_add_language($language_code, $language_order = 0, &$error_code = 0) $info = pll_get_default_language_information($language_code); $args = array( - name => $info['name'], - slug => $info['code'], - locale => $info['locale'], - rtl => $info['rtl'] ? 1 : 0, - term_group => $language_order + 'name' => $info['name'], + 'slug' => $info['code'], + 'locale' => $info['locale'], + 'rtl' => $info['rtl'] ? 1 : 0, + 'term_group' => $language_order ); $error_code = $adminModel->add_language($args); return $error_code !== 0; From 43aa96b6fe451cb0eb38571ea34f05a526eb5a66 Mon Sep 17 00:00:00 2001 From: Onni Hakala Date: Tue, 3 Jan 2017 11:40:37 +0200 Subject: [PATCH 3/4] Credit @villepietarinen for finding these bugs --- composer.json | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index 7eff6d7..904e891 100644 --- a/composer.json +++ b/composer.json @@ -9,12 +9,20 @@ ], "homepage": "https://github.com/dereckson/wp-cli-polylang", "license": "GPLv2", - "authors": [{ - "name": "Sébastien Santoro aka Dereckson", - "email": "dereckson@espace-win.org", - "homepage": "http://www.dereckson.be", - "role": "Developer" - }], + "authors": [ + { + "name": "Sébastien Santoro aka Dereckson", + "email": "dereckson@espace-win.org", + "homepage": "http://www.dereckson.be", + "role": "Developer" + }, + { + "name": "Ville Pietarinen", + "email": "ville@geniem.com", + "homepage": "http://geniem.com", + "role": "Developer" + } + ], "require": { "php": ">=5.3.0" }, From 0746b3b4e485c10bd5c8ee78491509da50b53f0d Mon Sep 17 00:00:00 2001 From: Onni Hakala Date: Tue, 3 Jan 2017 11:41:24 +0200 Subject: [PATCH 4/4] Fix composer license notation to composer schema --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 904e891..8fac474 100644 --- a/composer.json +++ b/composer.json @@ -8,7 +8,7 @@ "i18n" ], "homepage": "https://github.com/dereckson/wp-cli-polylang", - "license": "GPLv2", + "license": "GPL-2.0", "authors": [ { "name": "Sébastien Santoro aka Dereckson",