Peter M. Groen / knowledgetree

Commit de982b1c1a3bec32b3daa14ae8d2535c3556f143

Authored by kevin_fourie
1 parent 94c1e34a

Merged in from DEV trunk... 

KTS-2829
"Tags containing special characters are truncated at the first special character the system encounters."

Fixed. Changed strlower command to mb_strtolower to cater for special characters.

Committed By: Jonathan Byrne
Reviewed By: Jalaloedien Abrahams

KTS-2584
"Postscrip extractor is disabled on linux"
Updated. Updated binary name to ps2txt.

Committed By: Kevin Fourie
Reviewed By: Conrad Vermeulen


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/trunk@8154 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 2 changed files with 2 additions and 3 deletions
lib/upgrades/UpgradeFunctions.inc.php
  View file @de982b1
@@ -1055,7 +1055,7 @@ class UpgradeFunctions { @@ -1055,7 +1055,7 @@ class UpgradeFunctions {
1055 $ini->addItem('externalBinary', 'xls2csv', 'xls2csv', '', 'The following are external binaries that may be used by various parts of knowledgeTree.'); 1055 $ini->addItem('externalBinary', 'xls2csv', 'xls2csv', '', 'The following are external binaries that may be used by various parts of knowledgeTree.');
1056 $ini->addItem('externalBinary', 'pdftotext', 'pdftotext'); 1056 $ini->addItem('externalBinary', 'pdftotext', 'pdftotext');
1057 $ini->addItem('externalBinary', 'catppt', 'catppt'); 1057 $ini->addItem('externalBinary', 'catppt', 'catppt');
1058 - $ini->addItem('externalBinary', 'pstotext', 'pstotext'); 1058 + $ini->addItem('externalBinary', 'pstotext', 'ps2txt');
1059 $ini->addItem('externalBinary', 'catdoc', 'catdoc'); 1059 $ini->addItem('externalBinary', 'catdoc', 'catdoc');
1060 $ini->addItem('externalBinary', 'antiword', 'antiword'); 1060 $ini->addItem('externalBinary', 'antiword', 'antiword');
1061 $ini->addItem('externalBinary', 'python', 'python'); 1061 $ini->addItem('externalBinary', 'python', 'python');
plugins/tagcloud/TagCloudTriggers.php
  View file @de982b1
@@ -94,8 +94,7 @@ class KTAddDocumentTrigger { @@ -94,8 +94,7 @@ class KTAddDocumentTrigger {
94 94
95 foreach($tags as $sTag) 95 foreach($tags as $sTag)
96 { 96 {
97 - $sTag=strtolower(trim($sTag));  
98 - 97 + $sTag = mb_strtolower(trim($sTag), mb_detect_encoding($sTag));
99 $res = DBUtil::getOneResult(array("SELECT id FROM $words_table WHERE tag = ?", array($sTag))); 98 $res = DBUtil::getOneResult(array("SELECT id FROM $words_table WHERE tag = ?", array($sTag)));
100 99
101 if (PEAR::isError($res)) { 100 if (PEAR::isError($res)) {