Skip to content
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

Jump to bottom

Parsing error in language file com_kunena.templates.ini #6250

Merged
merged 4 commits into from
Mar 10, 2019
Merged

Parsing error in language file com_kunena.templates.ini #6250

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
dede9da
Parsing error in language file com_kunena.templates.ini
xillibit Mar 10, 2019
3c5f9b0
Parsing error in language file com_kunena.templates.ini #6250
xillibit Mar 10, 2019
737512e
Parsing error in language file com_kunena.templates.ini #6250
xillibit Mar 10, 2019
5a85e21
Parsing error in language file com_kunena.templates.ini #6250
xillibit Mar 10, 2019
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
2 changes: 1 addition & 1 deletion src/administrator/components/com_kunena/controllers/users.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1167,7 +1167,7 @@ protected function cleanSocial(&$user, $app)
$user->flickr = str_replace(' ', '', trim($app->input->getString('flickr', '')));
$user->bebo = str_replace(' ', '', trim($app->input->getString('bebo', '')));
$user->instagram = str_replace(' ', '', trim($app->input->getString('instagram', '')));
$user->qq = str_replace(' ', '', trim($app->input->getString('qq', '')));
$user->qqsocial = str_replace(' ', '', trim($app->input->getString('qqsocial', '')));
$user->qzone = str_replace(' ', '', trim($app->input->getString('qzone', '')));
$user->weibo = str_replace(' ', '', trim($app->input->getString('weibo', '')));
$user->wechat = str_replace(' ', '', trim($app->input->getString('wechat', '')));
Expand Down
6 changes: 6 additions & 0 deletions src/administrator/components/com_kunena/install/kunena.install.upgrade.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -841,6 +841,12 @@
'1000-01-01 00:00:00';
</query>
<query mode="silenterror">UPDATE `#__kunena_announcement` SET lasttime='1000-01-01 00:00:00' WHERE lasttime='0000-00-00 00:00:00'</query>
</version>
<version version="5.1.11-DEV"
versiondate="2019-10-03"
versionname="Internal">
<query mode="silenterror">ALTER TABLE `#__kunena_users` CHANGE `qq` `qqsocial` varchar(50);
</query>
</version>
<version version="@kunenaversion@"
versiondate="@kunenaversiondate@"
Expand Down
2 changes: 1 addition & 1 deletion src/administrator/components/com_kunena/install/sql/install/mysql/create_tables.utf8.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ CREATE TABLE IF NOT EXISTS `#__kunena_users` (
`linkedin_company` varchar(50) NULL,
`delicious` varchar(50) NULL,
`instagram` varchar(50) NULL,
`qq` varchar(50) NULL,
`qqsocial` varchar(50) NULL,
`blogspot` varchar(50) NULL,
`flickr` varchar(50) NULL,
`apple` varchar(50) NULL,
Expand Down
2 changes: 1 addition & 1 deletion src/administrator/components/com_kunena/language/en-GB/en-GB.com_kunena.libraries.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,7 @@ COM_KUNENA_MYPROFILE_TWITTER = "Twitter"
COM_KUNENA_MYPROFILE_VK = "VK"
COM_KUNENA_MYPROFILE_WHATSAPP = "WhatsApp"
COM_KUNENA_MYPROFILE_YIM = "YIM"
COM_KUNENA_MYPROFILE_QQ = "QQ"
COM_KUNENA_MYPROFILE_QQSOCIAL = "QQ"
COM_KUNENA_MYPROFILE_QZONE = "Qzone"
COM_KUNENA_MYPROFILE_YOUTUBE = "Youtube"
COM_KUNENA_MYPROFILE_OK = "Odnoklassniki"
Expand Down
4 changes: 2 additions & 2 deletions src/components/com_kunena/controllers/user.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,7 @@ public function ban()
$user->flickr = '';
$user->bebo = '';
$user->instagram = '';
$user->qq = '';
$user->qqsocial = '';
$user->qzone = '';
$user->whatsapp = '';
$user->youtube = '';
Expand Down Expand Up @@ -1021,7 +1021,7 @@ protected function saveProfile()
$user->flickr = str_replace(' ', '', trim($input->$method->get('flickr', '', 'string')));
$user->bebo = str_replace(' ', '', trim($input->$method->get('bebo', '', 'string')));
$user->instagram = str_replace(' ', '', trim($input->$method->get('instagram', '', 'string')));
$user->qq = str_replace(' ', '', trim($input->$method->get('qq', '', 'string')));
$user->qqsocial = str_replace(' ', '', trim($input->$method->get('qqsocial', '', 'string')));
$user->qzone = str_replace(' ', '', trim($input->$method->get('qzone', '', 'string')));
$user->weibo = str_replace(' ', '', trim($input->$method->get('weibo', '', 'string')));
$user->wechat = str_replace(' ', '', trim($input->$method->get('wechat', '', 'string')));
Expand Down
2 changes: 1 addition & 1 deletion src/components/com_kunena/language/en-GB/en-GB.com_kunena.templates.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,7 +476,7 @@ COM_KUNENA_MYPROFILE_TRASH = "Trash"
COM_KUNENA_MYPROFILE_TWITTER_DESC = "This is your Twitter username."
COM_KUNENA_MYPROFILE_YIM_DESC = "This is your Yahoo! Instant Messenger nickname."
COM_KUNENA_MYPROFILE_INSTAGRAM_DESC = "This is your Instagram account."
COM_KUNENA_MYPROFILE_QQ_DESC = "This is your QQ username."
COM_KUNENA_MYPROFILE_QQSOCIAL_DESC = "This is your QQ username."
COM_KUNENA_MYPROFILE_GOOGLE_DESC = "This is your Google username."
COM_KUNENA_MYPROFILE_MICROSOFT_DESC = "This is your Microsoft account."
COM_KUNENA_MYPROFILE_QZONE_DESC = "This is your Qzone account."
Expand Down
4 changes: 2 additions & 2 deletions src/libraries/kunena/user/user.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
* @property string $bebo
* @property int $thankyou
* @property string $instagram
* @property string $qq
* @property string $qqsocial
* @property string $qzone
* @property string $weibo
* @property string $wechat
Expand Down Expand Up @@ -2142,7 +2142,7 @@ public function socialButtons()
'flickr' => array('url' => 'https://www.flickr.com/photos/##VALUE##', 'title' => Text::_('COM_KUNENA_MYPROFILE_FLICKR'), 'nourl' => '0'),
'bebo' => array('url' => 'https://www.bebo.com/Profile.jsp?MemberId=##VALUE##', 'title' => Text::_('COM_KUNENA_MYPROFILE_BEBO'), 'nourl' => '0'),
'instagram' => array('url' => 'https://www.instagram.com/##VALUE##/', 'title' => Text::_('COM_KUNENA_MYPROFILE_INSTAGRAM'), 'nourl' => '0'),
'qq' => array('url' => '##VALUE##', 'title' => Text::_('COM_KUNENA_MYPROFILE_QQ'), 'nourl' => '1'),
'qqsocial' => array('url' => '##VALUE##', 'title' => Text::_('COM_KUNENA_MYPROFILE_QQSOCIAL'), 'nourl' => '1'),
'qzone' => array('url' => '##VALUE##', 'title' => Text::_('COM_KUNENA_MYPROFILE_QZONE'), 'nourl' => '1'),
'weibo' => array('url' => '##VALUE##', 'title' => Text::_('COM_KUNENA_MYPROFILE_WEIBO'), 'nourl' => '1'),
'wechat' => array('url' => '##VALUE##', 'title' => Text::_('COM_KUNENA_MYPROFILE_WECHAT'), 'nourl' => '1'),
Expand Down