From 93357083257a78b63e3acd9a1a24ea7b801b3282 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Fri, 20 Jan 2012 13:47:57 +0100 Subject: mention missing bug number #3439729 in changelog --- doc/ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/ChangeLog b/doc/ChangeLog index 68f5617..a9fcb04 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -5,7 +5,7 @@ ChangeLog for SemantiScuttle 0.98.4 - 2011-XX-XX ------------------- -- Fix bug: URLs were escaped too often in bookmark list +- Fix bug #3439729: URLs were escaped too often in bookmark list - Fix bug: Subtitle was not escaped - Fix bug #3388219: Incorrect URL when cancelling tag2tag-actions - Fix bug #3393951: Logo images missing on bookmark page -- cgit v1.2.3 From a0d2750fb282aa505c14588d718f1188ecf5fdad Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Fri, 20 Jan 2012 14:00:30 +0100 Subject: changelog entry for Fix bug #3436624: Wrong URL for Delicious API when importing --- doc/ChangeLog | 1 + 1 file changed, 1 insertion(+) (limited to 'doc') diff --git a/doc/ChangeLog b/doc/ChangeLog index a9fcb04..e5ca326 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -12,6 +12,7 @@ ChangeLog for SemantiScuttle - Fix bug #3399815: PHP error in opensearch API in 0.98.3 - Fix bug #3407728: Can't delete users from admin page - Fix bug #3431742: open_basedir problems with /etc/ config files +- Fix bug #3436624: Wrong URL for Delicious API when importing - Implement request #3403609: fr_CA translation update -- cgit v1.2.3 From 39b44229ad11f8544a876dd750c479947f783ca8 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Fri, 20 Jan 2012 14:24:33 +0100 Subject: Implement patch #3476011: PostgreSQL tables can not be initialized --- data/tables-postgresql.sql | 259 +++++++++++++++++++++++++++++++++++++++++++++ doc/ChangeLog | 1 + doc/INSTALL.txt | 2 + 3 files changed, 262 insertions(+) create mode 100644 data/tables-postgresql.sql (limited to 'doc') diff --git a/data/tables-postgresql.sql b/data/tables-postgresql.sql new file mode 100644 index 0000000..b0ada11 --- /dev/null +++ b/data/tables-postgresql.sql @@ -0,0 +1,259 @@ +-- Semantic Scuttle - Tables creation SQL script +-- ! Dont forget to change table names according to $tableprefix defined in config.php ! + +-- +-- Table structure for table "sc_bookmarks" +-- + +CREATE SEQUENCE bIds + INCREMENT BY 1 + NO MAXVALUE + NO MINVALUE + CACHE 1; + +CREATE TABLE sc_bookmarks ( + bId integer DEFAULT nextval('bIds'::text) PRIMARY KEY, + uId integer NOT NULL, + bIp varchar(40) DEFAULT NULL, + bStatus smallint NOT NULL, + bDatetime timestamp with time zone DEFAULT now() NOT NULL, + bModified timestamp with time zone DEFAULT now() NOT NULL, + bTitle varchar(255) DEFAULT '' NOT NULL, + bAddress varchar(1500) DEFAULT '' NOT NULL, + bDescription text, + bPrivateNote text, + bHash varchar(32) DEFAULT '' NOT NULL, + bVotes integer NOT NULL, + bVoting integer NOT NULL, + bShort varchar(16) DEFAULT NULL +); + +CREATE INDEX sc_bookmarks_usd ON sc_bookmarks (uId, bStatus, bDatetime); +CREATE INDEX sc_bookmarks_hui ON sc_bookmarks (bHash, uId, bId); +CREATE INDEX sc_bookmarks_du ON sc_bookmarks (bDatetime, uId); + +-- +-- Table structure for table "sc_bookmarks2tags" +-- + +CREATE SEQUENCE b2tIds + INCREMENT BY 1 + NO MAXVALUE + NO MINVALUE + CACHE 1; + +CREATE TABLE sc_bookmarks2tags ( + id integer DEFAULT nextval('b2tIds'::text) PRIMARY KEY, + bId integer NOT NULL, + tag varchar(100) DEFAULT '' NOT NULL +); + +CREATE UNIQUE INDEX sc_bookmarks2tags_tag_bId on sc_bookmarks2tags (tag, bId); +CREATE INDEX sc_bookmarks2tags_bId on sc_bookmarks2tags (bId); + +-- +-- Table structure for table "sc_commondescription" +-- + +CREATE SEQUENCE cdIds + INCREMENT BY 1 + NO MAXVALUE + NO MINVALUE + CACHE 1; + +CREATE TABLE sc_commondescription ( + cdId integer DEFAULT nextval('cdIds'::text) PRIMARY KEY, + uId integer NOT NULL, + tag varchar(100) DEFAULT '' NOT NULL, + bHash varchar(32) DEFAULT '' NOT NULL, + cdTitle varchar(255) DEFAULT '' NOT NULL, + cdDescription text, + cdDatetime timestamp with time zone DEFAULT now() NOT NULL +); + +CREATE UNIQUE INDEX sc_commondescription_tag_timestamp on sc_commondescription (tag, cdDatetime); +CREATE UNIQUE INDEX sc_commondescription_bookmark_timestamp on sc_commondescription (bHash, cdDatetime); + +-- +-- Table structure for table "sc_searchhistory" +-- + +CREATE SEQUENCE shIds + INCREMENT BY 1 + NO MAXVALUE + NO MINVALUE + CACHE 1; + +CREATE TABLE sc_searchhistory ( + shId integer DEFAULT nextval('shIds'::text) PRIMARY KEY, + shTerms varchar(255) NOT NULL DEFAULT '', + shRange varchar(32) NOT NULL DEFAULT '', + shDatetime timestamp with time zone DEFAULT now() NOT NULL, + shNbResults integer NOT NULL, + uId integer NOT NULL +); + +-- +-- Table structure for table "sc_tags" +-- + +CREATE SEQUENCE tIds + INCREMENT BY 1 + NO MAXVALUE + NO MINVALUE + CACHE 1; + +CREATE TABLE sc_tags ( + tId integer DEFAULT nextval('tIds'::text) PRIMARY KEY, + tag varchar(100) NOT NULL DEFAULT '', + uId integer NOT NULL, + tDescription text +); + +CREATE UNIQUE INDEX sc_tags_tag_uId on sc_tags (tag, uId); + +-- +-- Table structure for table "sc_tags2tags" +-- + +CREATE SEQUENCE ttIds + INCREMENT BY 1 + NO MAXVALUE + NO MINVALUE + CACHE 1; + +CREATE TABLE sc_tags2tags ( + ttId integer DEFAULT nextval('ttIds'::text) PRIMARY KEY, + tag1 varchar(100) NOT NULL DEFAULT '', + tag2 varchar(100) NOT NULL DEFAULT '', + relationType varchar(32) NOT NULL DEFAULT '', + uId integer NOT NULL +); + +CREATE UNIQUE INDEX sc_tags2tags_tag1_tag2_uId on sc_tags2tags (tag1, tag2, relationType, uId); + +-- +-- Table structure for table "sc_tagscache" +-- + +CREATE SEQUENCE tcIds + INCREMENT BY 1 + NO MAXVALUE + NO MINVALUE + CACHE 1; + +CREATE TABLE sc_tagscache ( + tcId integer DEFAULT nextval('tcIds'::text) PRIMARY KEY, + tag1 varchar(100) NOT NULL DEFAULT '', + tag2 varchar(100) NOT NULL DEFAULT '', + relationType varchar(32) NOT NULL DEFAULT '', + uId integer NOT NULL DEFAULT '0' +); + +CREATE UNIQUE INDEX sc_tagscache_tag1_tag2_type_uId on sc_tagscache (tag1, tag2, relationType, uId); + +-- +-- Table structure for table "sc_tagsstats" +-- + +CREATE SEQUENCE tstIds + INCREMENT BY 1 + NO MAXVALUE + NO MINVALUE + CACHE 1; + +CREATE TABLE sc_tagsstats ( + tstId integer DEFAULT nextval('tstIds'::text) PRIMARY KEY, + tag1 varchar(100) NOT NULL DEFAULT '', + relationType varchar(32) NOT NULL DEFAULT '', + uId integer NOT NULL, + nb integer NOT NULL, + depth integer NOT NULL, + nbupdate integer NOT NULL +); + +CREATE UNIQUE INDEX sc_tagsstats_tag1_type_uId on sc_tagsstats (tag1, relationType, uId); + +-- +-- Table structure for table "sc_users" +-- + +CREATE SEQUENCE uIds + INCREMENT BY 1 + NO MAXVALUE + NO MINVALUE + CACHE 1; + +CREATE TABLE sc_users ( + uId integer DEFAULT nextval('uIds'::text) PRIMARY KEY, + username varchar(25) NOT NULL DEFAULT '', + password varchar(40) NOT NULL DEFAULT '', + uDatetime timestamp with time zone DEFAULT now() NOT NULL, + uModified timestamp with time zone DEFAULT now() NOT NULL, + name varchar(50) DEFAULT NULL, + email varchar(50) NOT NULL DEFAULT '', + homepage varchar(255) DEFAULT NULL, + uContent text, + privateKey varchar(33) DEFAULT NULL +); + +CREATE UNIQUE INDEX privateKey on sc_users (privateKey); + +-- +-- Table structure for table "sc_users_sslclientcerts" +-- + +CREATE SEQUENCE ids + INCREMENT BY 1 + NO MAXVALUE + NO MINVALUE + CACHE 1; + +CREATE TABLE sc_users_sslclientcerts ( + id integer DEFAULT nextval('ids'::text) PRIMARY KEY, + uId integer NOT NULL, + sslSerial varchar(32) DEFAULT '' NOT NULL, + sslClientIssuerDn varchar(1024) DEFAULT '' NOT NULL, + sslName varchar(64) DEFAULT '' NOT NULL, + sslEmail varchar(64) DEFAULT '' NOT NULL +); + +-- +-- Table structure for table "sc_version" +-- + +CREATE TABLE sc_version ( + schema_version integer NOT NULL +); + +-- +-- Table structure for table "sc_votes" +-- + +CREATE TABLE sc_votes ( + bId integer NOT NULL, + uId integer NOT NULL, + vote integer NOT NULL +); + +CREATE UNIQUE INDEX bid_2 on sc_votes (bId, uId); +CREATE INDEX bid on sc_votes (bId); +CREATE INDEX uid on sc_votes (uId); + +-- +-- Table structure for table "sc_watched" +-- + +CREATE SEQUENCE wIds + INCREMENT BY 1 + NO MAXVALUE + NO MINVALUE + CACHE 1; + +CREATE TABLE sc_watched ( + wId integer DEFAULT nextval('wIds'::text) PRIMARY KEY, + uId integer NOT NULL, + watched integer NOT NULL +); + +CREATE INDEX sc_watched_uId on sc_watched (uId); diff --git a/doc/ChangeLog b/doc/ChangeLog index e5ca326..adb30bb 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -14,6 +14,7 @@ ChangeLog for SemantiScuttle - Fix bug #3431742: open_basedir problems with /etc/ config files - Fix bug #3436624: Wrong URL for Delicious API when importing - Implement request #3403609: fr_CA translation update +- Implement patch #3476011: PostgreSQL tables can not be initialized 0.98.3 - 2011-08-09 diff --git a/doc/INSTALL.txt b/doc/INSTALL.txt index fbd44f9..953dc63 100644 --- a/doc/INSTALL.txt +++ b/doc/INSTALL.txt @@ -21,6 +21,8 @@ Installation instructions on the shell ("semanticscuttle" being the database name) + If you run PostgreSQL, use ``data/tables.postgresql.sql``. + 3. Copy ``data/config.php.dist`` to ``data/config.php`` and modify it as necessary. See configuration_ for more information. 4. Make the cache directory writable by your web server. -- cgit v1.2.3 From 79d1e2de1097bb73b2cc1e7d0190a6c2bc05268d Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Fri, 20 Jan 2012 14:28:50 +0100 Subject: Part of #3476011: mention Frederics name --- doc/ChangeLog | 1 + 1 file changed, 1 insertion(+) (limited to 'doc') diff --git a/doc/ChangeLog b/doc/ChangeLog index adb30bb..67da85e 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -15,6 +15,7 @@ ChangeLog for SemantiScuttle - Fix bug #3436624: Wrong URL for Delicious API when importing - Implement request #3403609: fr_CA translation update - Implement patch #3476011: PostgreSQL tables can not be initialized + (Frédéric Fauberteau [triaxx]) 0.98.3 - 2011-08-09 -- cgit v1.2.3 From f8b7d0243ca17506aeda80f2f0e3608b382da6aa Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Fri, 20 Jan 2012 15:03:29 +0100 Subject: Fully fix bug #3463481: use proper self URL, different page url --- data/templates/default/rss.tpl.php | 2 +- doc/ChangeLog | 1 + www/rss.php | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) (limited to 'doc') diff --git a/data/templates/default/rss.tpl.php b/data/templates/default/rss.tpl.php index fd5bdbf..4aba277 100644 --- a/data/templates/default/rss.tpl.php +++ b/data/templates/default/rss.tpl.php @@ -6,7 +6,7 @@ echo '<' . '?xml version="1.0" encoding="utf-8" ?' . ">\n"; > <?php echo $feedtitle; ?> - + diff --git a/doc/ChangeLog b/doc/ChangeLog index 67da85e..d52787c 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -13,6 +13,7 @@ ChangeLog for SemantiScuttle - Fix bug #3407728: Can't delete users from admin page - Fix bug #3431742: open_basedir problems with /etc/ config files - Fix bug #3436624: Wrong URL for Delicious API when importing +- Fix bug #3463481: RSS feed show warnings in feedvalidator.org - Implement request #3403609: fr_CA translation update - Implement patch #3476011: PostgreSQL tables can not be initialized (Frédéric Fauberteau [triaxx]) diff --git a/www/rss.php b/www/rss.php index 3628a2e..1f88944 100644 --- a/www/rss.php +++ b/www/rss.php @@ -124,7 +124,8 @@ if ($cat) { } $tplVars['feedtitle'] = filter($GLOBALS['sitename'] . (isset($pagetitle) ? $pagetitle : '')); -$tplVars['feedlink'] = addProtocolToUrl(ROOT); +$tplVars['pagelink'] = addProtocolToUrl(ROOT); +$tplVars['feedlink'] = addProtocolToUrl(ROOT) . 'rss?sort=' . getSortOrder(); $tplVars['feeddescription'] = sprintf(T_('Recent bookmarks posted to %s'), $GLOBALS['sitename']); $bookmarks = $bookmarkservice->getBookmarks( -- cgit v1.2.3 From d8ee343473c23d856f1b148067060e9edd0aa9b0 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Fri, 20 Jan 2012 15:09:39 +0100 Subject: Fix bug #3384416: Use URL with protocol in bookmarklet --- data/templates/default/bookmarklet.inc.php | 8 ++++---- doc/ChangeLog | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'doc') diff --git a/data/templates/default/bookmarklet.inc.php b/data/templates/default/bookmarklet.inc.php index 9867745..c93f581 100644 --- a/data/templates/default/bookmarklet.inc.php +++ b/data/templates/default/bookmarklet.inc.php @@ -45,7 +45,7 @@ if (browser == "Opera") { + '' - + '
  • <\/a><\/li>' + + '
  • <\/a><\/li>' + '
  • ' + '' + '' + '' diff --git a/doc/ChangeLog b/doc/ChangeLog index d52787c..13fc747 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -14,6 +14,7 @@ ChangeLog for SemantiScuttle - Fix bug #3431742: open_basedir problems with /etc/ config files - Fix bug #3436624: Wrong URL for Delicious API when importing - Fix bug #3463481: RSS feed show warnings in feedvalidator.org +- Fix bug #3384416: Use URL with protocol in bookmarklet - Implement request #3403609: fr_CA translation update - Implement patch #3476011: PostgreSQL tables can not be initialized (Frédéric Fauberteau [triaxx]) -- cgit v1.2.3 From 645f21b1a90b7369218913eea8fba711e12f9d20 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Fri, 20 Jan 2012 15:20:16 +0100 Subject: Fix bug: Invalid HTML when website thumbnails are activated --- data/templates/default/bookmarks-thumbnail.inc.tpl.php | 2 +- doc/ChangeLog | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'doc') diff --git a/data/templates/default/bookmarks-thumbnail.inc.tpl.php b/data/templates/default/bookmarks-thumbnail.inc.tpl.php index 200b8f7..77cc67f 100644 --- a/data/templates/default/bookmarks-thumbnail.inc.tpl.php +++ b/data/templates/default/bookmarks-thumbnail.inc.tpl.php @@ -13,6 +13,6 @@ $thumbnailHash = md5( $address . $GLOBALS['thumbnailsUserId'] . $GLOBALS['thumbnailsKey'] ); //echo ''; -echo ''; +echo ''; ?> \ No newline at end of file diff --git a/doc/ChangeLog b/doc/ChangeLog index 13fc747..3f93289 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -15,6 +15,7 @@ ChangeLog for SemantiScuttle - Fix bug #3436624: Wrong URL for Delicious API when importing - Fix bug #3463481: RSS feed show warnings in feedvalidator.org - Fix bug #3384416: Use URL with protocol in bookmarklet +- Fix bug: Invalid HTML when website thumbnails are activated - Implement request #3403609: fr_CA translation update - Implement patch #3476011: PostgreSQL tables can not be initialized (Frédéric Fauberteau [triaxx]) -- cgit v1.2.3 From 22eaa812bfa27fe6d1662237c1908193f4637090 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Fri, 20 Jan 2012 21:12:46 +0100 Subject: Fix bug #3413459: Thumbnails not in one line, thanks http://quirksmode.org/css/clearing.html for the CSS hint --- doc/ChangeLog | 1 + www/themes/default/scuttle.css | 1 + 2 files changed, 2 insertions(+) (limited to 'doc') diff --git a/doc/ChangeLog b/doc/ChangeLog index 3f93289..6297764 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -16,6 +16,7 @@ ChangeLog for SemantiScuttle - Fix bug #3463481: RSS feed show warnings in feedvalidator.org - Fix bug #3384416: Use URL with protocol in bookmarklet - Fix bug: Invalid HTML when website thumbnails are activated +- Fix bug #3413459: Thumbnails not in one line - Implement request #3403609: fr_CA translation update - Implement patch #3476011: PostgreSQL tables can not be initialized (Frédéric Fauberteau [triaxx]) diff --git a/www/themes/default/scuttle.css b/www/themes/default/scuttle.css index 9e87857..f37377d 100644 --- a/www/themes/default/scuttle.css +++ b/www/themes/default/scuttle.css @@ -223,6 +223,7 @@ li.xfolkentry { border-bottom: 1px solid #DDD; margin-bottom: 0; padding: 1em 0.5em; + overflow: auto; } html > body li.xfolkentry { border-bottom: 1px dotted #AAA; -- cgit v1.2.3 From a9df65da0888233e66e35aa6fef3d5870db73d4f Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Fri, 20 Jan 2012 21:27:04 +0100 Subject: Fix bug #3468293: Delicious import does not preserve private links --- doc/ChangeLog | 1 + .../BookmarkTest_deliciousbookmarks_private.xml | 1 + www/import.php | 29 +++++++++++++++++----- 3 files changed, 25 insertions(+), 6 deletions(-) create mode 100644 tests/data/BookmarkTest_deliciousbookmarks_private.xml (limited to 'doc') diff --git a/doc/ChangeLog b/doc/ChangeLog index 6297764..8485802 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -17,6 +17,7 @@ ChangeLog for SemantiScuttle - Fix bug #3384416: Use URL with protocol in bookmarklet - Fix bug: Invalid HTML when website thumbnails are activated - Fix bug #3413459: Thumbnails not in one line +- Fix bug #3468293: Delicious import does not preserve private links - Implement request #3403609: fr_CA translation update - Implement patch #3476011: PostgreSQL tables can not be initialized (Frédéric Fauberteau [triaxx]) diff --git a/tests/data/BookmarkTest_deliciousbookmarks_private.xml b/tests/data/BookmarkTest_deliciousbookmarks_private.xml new file mode 100644 index 0000000..0ad8142 --- /dev/null +++ b/tests/data/BookmarkTest_deliciousbookmarks_private.xml @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/www/import.php b/www/import.php index 3aa2714..1293a2f 100644 --- a/www/import.php +++ b/www/import.php @@ -27,7 +27,9 @@ require_once 'www-header.php'; /* Managing all possible inputs */ // First input is $_FILES // Other inputs -isset($_POST['status']) ? define('POST_STATUS', $_POST['status']): define('POST_STATUS', $GLOBALS['defaults']['privacy']); +isset($_POST['status']) + ? define('POST_STATUS', $_POST['status']) + : define('POST_STATUS', $GLOBALS['defaults']['privacy']); if ($userservice->isLoggedOn() && sizeof($_FILES) > 0 && $_FILES['userfile']['size'] > 0) { @@ -54,6 +56,7 @@ if ($userservice->isLoggedOn() && sizeof($_FILES) > 0 && $_FILES['userfile']['si } } xml_parser_free($xml_parser); + //FIXME: show errors and warnings header('Location: '. createURL('bookmarks', $userinfo->getUsername())); } else { $templatename = 'importDelicious.tpl'; @@ -70,7 +73,8 @@ function startElement($parser, $name, $attrs) { $bookmarkservice =SemanticScuttle_Service_Factory::get('Bookmark'); if ($name == 'POST') { - while(list($attrTitle, $attrVal) = each($attrs)) { + $newstatus = $status; + while (list($attrTitle, $attrVal) = each($attrs)) { switch ($attrTitle) { case 'HREF': $bAddress = $attrVal; @@ -87,6 +91,11 @@ function startElement($parser, $name, $attrs) { case 'TAG': $tags = strtolower($attrVal); break; + case 'PRIVATE': + if ($attrVal == 'yes') { + $newstatus = 2; + } + break; } } if ($bookmarkservice->bookmarkExists($bAddress, $userservice->getCurrentUserId())) { @@ -100,12 +109,20 @@ function startElement($parser, $name, $attrs) { $bDatetime = gmdate('Y-m-d H:i:s'); } - if ($bookmarkservice->addBookmark($bAddress, $bTitle, $bDescription, '', $status, $tags, null, $bDatetime, true, true)) - $tplVars['msg'] = T_('Bookmark imported.'); - else - $tplVars['error'] = T_('There was an error saving your bookmark. Please try again or contact the administrator.'); + $res = $bookmarkservice->addBookmark( + $bAddress, $bTitle, $bDescription, '', $newstatus, $tags, + null, $bDatetime, true, true + ); + if ($res) { + $tplVars['msg'] = T_('Bookmark imported.'); + } else { + $tplVars['error'] = T_('There was an error saving your bookmark. Please try again or contact the administrator.'); + } } } + if (!isset($depth[$parser])) { + $depth[$parser] = 0; + } $depth[$parser]++; } -- cgit v1.2.3 From d6d44c6cfa7e3e5cdb36d9e4abd3a62edad74eb9 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Fri, 20 Jan 2012 22:04:10 +0100 Subject: Fix bug #3396727: Title of http://lesscss.org/ not loaded --- doc/ChangeLog | 1 + www/ajaxGetTitle.php | 3 +++ 2 files changed, 4 insertions(+) (limited to 'doc') diff --git a/doc/ChangeLog b/doc/ChangeLog index 8485802..6a08fea 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -18,6 +18,7 @@ ChangeLog for SemantiScuttle - Fix bug: Invalid HTML when website thumbnails are activated - Fix bug #3413459: Thumbnails not in one line - Fix bug #3468293: Delicious import does not preserve private links +- Fix bug #3396727: Title of http://lesscss.org/ not loaded - Implement request #3403609: fr_CA translation update - Implement patch #3476011: PostgreSQL tables can not be initialized (Frédéric Fauberteau [triaxx]) diff --git a/www/ajaxGetTitle.php b/www/ajaxGetTitle.php index 8e5d92c..e1fbe30 100644 --- a/www/ajaxGetTitle.php +++ b/www/ajaxGetTitle.php @@ -50,7 +50,10 @@ function getTitle($url) { $title = @mb_convert_encoding($title, 'UTF-8', $encoding); } + $title = trim($title); + if (utf8_strlen($title) > 0) { + $title = html_entity_decode($title, ENT_QUOTES, 'UTF-8'); return $title; } else { // No title, so return filename -- cgit v1.2.3