Skip to content

Fix php7 and polylang path changes #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
onnimonni wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fix php7 and polylang path changes #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c54f106
Fix changed polylang languages path
onnimonni Jan 3, 2017
70b6485
Fix array so it works in php5 and php7
onnimonni Jan 3, 2017
43aa96b
Credit @villepietarinen for finding these bugs
onnimonni Jan 3, 2017
0746b3b
Fix composer license notation to composer schema
onnimonni Jan 3, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions PolylangHelperFunctions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down Expand Up @@ -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;
Expand Down
22 changes: 15 additions & 7 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,21 @@
"i18n"
],
"homepage": "https://github.com/dereckson/wp-cli-polylang",
"license": "GPLv2",
"authors": [{
"name": "Sébastien Santoro aka Dereckson",
"email": "[email protected]",
"homepage": "http://www.dereckson.be",
"role": "Developer"
}],
"license": "GPL-2.0",
"authors": [
{
"name": "Sébastien Santoro aka Dereckson",
"email": "[email protected]",
"homepage": "http://www.dereckson.be",
"role": "Developer"
},
{
"name": "Ville Pietarinen",
"email": "[email protected]",
"homepage": "http://geniem.com",
"role": "Developer"
}
],
"require": {
"php": ">=5.3.0"
},
Expand Down