diff options
author | querwurzelt <> | 2019-01-20 22:19:33 +0100 |
---|---|---|
committer | querwurzelt <> | 2019-01-21 22:15:21 +0100 |
commit | ea04385bc16de6b7b65aab75c5c33cfe2d71ea84 (patch) | |
tree | ce675e51c2604149cb8a949b7ef3d92e98bc2f52 /data | |
parent | e636523aac630d73cda415cf551d0be570ce10d6 (diff) | |
download | semanticscuttle-ea04385bc16de6b7b65aab75c5c33cfe2d71ea84.tar.gz semanticscuttle-ea04385bc16de6b7b65aab75c5c33cfe2d71ea84.tar.bz2 |
PHP 7.3 compat, bug fixes
Diffstat (limited to 'data')
-rw-r--r-- | data/config.default.php | 6 | ||||
-rw-r--r-- | data/config.php.dist | 6 | ||||
-rw-r--r-- | data/schema/2.sql | 2 | ||||
-rw-r--r-- | data/tables.sql | 7 | ||||
-rw-r--r-- | data/templates/default/dynamictags.inc.php | 2 | ||||
-rw-r--r-- | data/templates/default/sidebar.block.popular.php | 2 | ||||
-rw-r--r-- | data/templates/default/sidebar.block.recent.php | 2 | ||||
-rw-r--r-- | data/templates/default/tags.tpl.php | 2 |
8 files changed, 16 insertions, 13 deletions
diff --git a/data/config.default.php b/data/config.default.php index 8af04ba..bb9eddb 100644 --- a/data/config.default.php +++ b/data/config.default.php @@ -115,7 +115,7 @@ $usecache = false; * * @var string */ -$dir_cache = dirname(__FILE__) . '/cache/'; +$dir_cache = dirname(__DIR__, 1) . '/cache'; /** * Use clean urls without .php filenames. @@ -149,14 +149,14 @@ $debugMode = false; * * @var string */ -$dbtype = 'mysql4'; +$dbtype = 'mysqli'; /** * Database hostname/IP * * @var string */ -$dbhost = '127.0.0.1'; +$dbhost = 'localhost'; /** * Database port. diff --git a/data/config.php.dist b/data/config.php.dist index 5f49857..61eb7af 100644 --- a/data/config.php.dist +++ b/data/config.php.dist @@ -46,7 +46,7 @@ $cleanurls = false; * * @var boolean */ -$debugMode = true; +$debugMode = false; /*************************************************** @@ -62,7 +62,7 @@ $debugMode = true; * * @var string */ -$dbtype = 'mysql4'; +$dbtype = 'mysqli'; /** * Database username * @@ -89,7 +89,7 @@ $dbname = 'scuttle'; * * @var string */ -$dbhost = '127.0.0.1'; +$dbhost = 'localhost'; /*************************************************** diff --git a/data/schema/2.sql b/data/schema/2.sql index 6c3bfaf..171e011 100644 --- a/data/schema/2.sql +++ b/data/schema/2.sql @@ -1,4 +1,4 @@ -ALTER TABLE `sc_bookmarks` CHANGE `bDescription` `bDescription` VARCHAR( 1500 ) +ALTER TABLE `sc_bookmarks` CHANGE `bDescription` `bDescription` VARCHAR( 1500 ); CREATE TABLE `sc_tagscache` ( `tcId` int(11) NOT NULL auto_increment, `tag1` varchar(100) NOT NULL default '', diff --git a/data/tables.sql b/data/tables.sql index 68d5ba9..de1bb8d 100644 --- a/data/tables.sql +++ b/data/tables.sql @@ -5,6 +5,9 @@ -- Table structure for table `sc_bookmarks` -- +# to avoid STRICT_TRANS_TABLES mode +SET sql_mode = ''; + CREATE TABLE `sc_bookmarks` ( `bId` int(11) NOT NULL auto_increment, `uId` int(11) NOT NULL default '0', @@ -17,8 +20,8 @@ CREATE TABLE `sc_bookmarks` ( `bDescription` text default NULL, `bPrivateNote` text default NULL, `bHash` varchar(32) NOT NULL default '', - `bVotes` int(11) NOT NULL, - `bVoting` int(11) NOT NULL, + `bVotes` int(11) NOT NULL default '0', + `bVoting` int(11) NOT NULL default '0', `bShort` varchar(16) default NULL, PRIMARY KEY (`bId`), KEY `sc_bookmarks_usd` (`uId`,`bStatus`,`bDatetime`), diff --git a/data/templates/default/dynamictags.inc.php b/data/templates/default/dynamictags.inc.php index c2ab6d4..f731048 100644 --- a/data/templates/default/dynamictags.inc.php +++ b/data/templates/default/dynamictags.inc.php @@ -53,7 +53,7 @@ JS; $taglist = ''; foreach (array_keys($tagsCloud) as $key) { $row = $tagsCloud[$key]; - $entries = T_ngettext('bookmark', 'bookmarks', $row['bCount']); + $entries = T_ngettext('bookmark', 'bookmarks', (int)$row['bCount']); $taglist .= '<span' . ' title="'. $row['bCount'] . ' ' . $entries . '"' . ' style="font-size:' . $row['size'] . '"' diff --git a/data/templates/default/sidebar.block.popular.php b/data/templates/default/sidebar.block.popular.php index 842aa60..83ad2fb 100644 --- a/data/templates/default/sidebar.block.popular.php +++ b/data/templates/default/sidebar.block.popular.php @@ -31,7 +31,7 @@ if ($popularTags && count($popularTags) > 0) { } foreach ($popularTags as $row) { - $entries = T_ngettext('bookmark', 'bookmarks', $row['bCount']); + $entries = T_ngettext('bookmark', 'bookmarks', (int)$row['bCount']); $contents .= '<a href="'. sprintf($cat_url, $user, filter($row['tag'], 'url')) .'" title="'. $row['bCount'] .' '. $entries .'" rel="tag" style="font-size:'. $row['size'] .'">'. filter($row['tag']) .'</a> '; } echo $contents ."\n"; diff --git a/data/templates/default/sidebar.block.recent.php b/data/templates/default/sidebar.block.recent.php index 80ae71c..1deae27 100644 --- a/data/templates/default/sidebar.block.recent.php +++ b/data/templates/default/sidebar.block.recent.php @@ -26,7 +26,7 @@ if ($recentTags && count($recentTags) > 0) { } foreach ($recentTags as $row) { - $entries = T_ngettext('bookmark', 'bookmarks', $row['bCount']); + $entries = T_ngettext('bookmark', 'bookmarks', (int)$row['bCount']); $contents .= '<a href="'. sprintf($cat_url, $user, filter($row['tag'], 'url')) .'" title="'. $row['bCount'] .' '. $entries .'" rel="tag" style="font-size:'. $row['size'] .'">'. filter($row['tag']) .'</a> '; } echo $contents ."</p>\n"; diff --git a/data/templates/default/tags.tpl.php b/data/templates/default/tags.tpl.php index d6259cc..dce5e1c 100644 --- a/data/templates/default/tags.tpl.php +++ b/data/templates/default/tags.tpl.php @@ -16,7 +16,7 @@ if ($tags && count($tags) > 0) { <?php $contents = ''; foreach ($tags as $row) { - $entries = T_ngettext('bookmark', 'bookmarks', $row['bCount']); + $entries = T_ngettext('bookmark', 'bookmarks', (int)$row['bCount']); $contents .= '<a href="'. sprintf($cat_url, $user, filter($row['tag'], 'url')) .'" title="'. $row['bCount'] .' '. $entries .'" rel="tag" style="font-size:'. $row['size'] .'">'. filter($row['tag']) .'</a> '; } echo $contents ."\n"; |