freetag minor fix for taglist and remove CDNs
This commit is contained in:
parent
6488381052
commit
719f251130
|
@ -1,7 +1,12 @@
|
||||||
|
3.59:
|
||||||
|
----
|
||||||
|
* Remove CDNs and upgrade jquery-migrate
|
||||||
|
* Minor fix for taglist
|
||||||
|
|
||||||
3.58:
|
3.58:
|
||||||
----
|
----
|
||||||
* Fix doubled encoded umlaut taglinks by searchengines backlinks.
|
* Fix doubled encoded umlaut taglinks by searchengines backlinks.
|
||||||
* Added a new option to allow showing taglink entries as a linklist.
|
* Added a new option to allow showing taglink entries as a linklist.
|
||||||
This adds a 'taglist' tag as a reserved command to tags,
|
This adds a 'taglist' tag as a reserved command to tags,
|
||||||
which not allows this tag as a normal tag any further.
|
which not allows this tag as a normal tag any further.
|
||||||
The addition can be done either by the preset taglink as "/plugin/taglist/"
|
The addition can be done either by the preset taglink as "/plugin/taglist/"
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
When using extended smarty output, the following code illustrates how the
|
When using extended smarty output, the following code illustrates how the
|
||||||
smarty-variables could be used when dropped into the entries.tpl:
|
smarty-variables could be used when dropped into the entries.tpl:
|
||||||
|
|
||||||
{if isset($entry.freetag.extended) && $entry.freetag.extended == 1}
|
{if isset($entry.freetag.extended) && $entry.freetag.extended == 1}
|
||||||
|
@ -8,7 +8,7 @@ smarty-variables could be used when dropped into the entries.tpl:
|
||||||
{$tag}
|
{$tag}
|
||||||
{/foreach}
|
{/foreach}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{if $is_single_entry or $is_preview}
|
{if $is_single_entry or $is_preview}
|
||||||
{$entry.freetag.related.description}
|
{$entry.freetag.related.description}
|
||||||
<ul class="serendipity_freeTag_related">
|
<ul class="serendipity_freeTag_related">
|
||||||
|
@ -27,10 +27,10 @@ smarty-variables could be used when dropped into the entries.tpl:
|
||||||
|
|
||||||
Using this subquery you can convert existing categories to tags:
|
Using this subquery you can convert existing categories to tags:
|
||||||
|
|
||||||
INSERT INTO serendipity_entrytags (entryid, tag)
|
INSERT INTO serendipity_entrytags (entryid, tag)
|
||||||
SELECT serendipity_entries.id, serendipity_category.category_name
|
SELECT serendipity_entries.id, serendipity_category.category_name
|
||||||
FROM serendipity_entries, serendipity_category, serendipity_entrycat
|
FROM serendipity_entries, serendipity_category, serendipity_entrycat
|
||||||
WHERE serendipity_entrycat.entryid = serendipity_entries.id
|
WHERE serendipity_entrycat.entryid = serendipity_entries.id
|
||||||
AND serendipity_category.categoryid = serendipity_entrycat.categoryid;
|
AND serendipity_category.categoryid = serendipity_entrycat.categoryid;
|
||||||
|
|
||||||
[quoted from: http://pixelated-dreams.com/archives/229-Spring-Cleaning.html]
|
[quoted from: http://pixelated-dreams.com/archives/229-Spring-Cleaning.html]
|
||||||
|
@ -55,7 +55,7 @@ foreach($rows AS $row) {
|
||||||
serendipity_db_escape_string($row['category_name'])
|
serendipity_db_escape_string($row['category_name'])
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
|
||||||
printf(
|
printf(
|
||||||
"Category '%s' added as Tag for Entry #%d, '%s'<br />\n",
|
"Category '%s' added as Tag for Entry #%d, '%s'<br />\n",
|
||||||
htmlspecialchars($row['category_name']),
|
htmlspecialchars($row['category_name']),
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
Using this subquery you can convert existing categories to tags:
|
Using this subquery you can convert existing categories to tags:
|
||||||
|
|
||||||
INSERT INTO serendipity_entrytags (entryid, tag)
|
INSERT INTO serendipity_entrytags (entryid, tag)
|
||||||
SELECT serendipity_entries.id, serendipity_category.category_name
|
SELECT serendipity_entries.id, serendipity_category.category_name
|
||||||
FROM serendipity_entries, serendipity_category, serendipity_entrycat
|
FROM serendipity_entries, serendipity_category, serendipity_entrycat
|
||||||
WHERE serendipity_entrycat.entryid = serendipity_entries.id
|
WHERE serendipity_entrycat.entryid = serendipity_entries.id
|
||||||
AND serendipity_category.categoryid = serendipity_entrycat.categoryid;
|
AND serendipity_category.categoryid = serendipity_entrycat.categoryid;
|
||||||
|
|
||||||
[quoted from: http://pixelated-dreams.com/archives/229-Spring-Cleaning.html]
|
[quoted from: http://pixelated-dreams.com/archives/229-Spring-Cleaning.html]
|
||||||
|
@ -28,7 +28,7 @@ foreach($rows AS $row) {
|
||||||
serendipity_db_escape_string($row['category_name'])
|
serendipity_db_escape_string($row['category_name'])
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
|
||||||
printf(
|
printf(
|
||||||
"Category '%s' added as Tag for Entry #%d, '%s'<br />\n",
|
"Category '%s' added as Tag for Entry #%d, '%s'<br />\n",
|
||||||
htmlspecialchars($row['category_name']),
|
htmlspecialchars($row['category_name']),
|
||||||
|
|
4
serendipity_event_freetag/jquery-1.11.1.min.js
vendored
Normal file
4
serendipity_event_freetag/jquery-1.11.1.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
2
serendipity_event_freetag/jquery-migrate-1.2.1.min.js
vendored
Normal file
2
serendipity_event_freetag/jquery-migrate-1.2.1.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
|
@ -72,7 +72,7 @@ class serendipity_event_freetag extends serendipity_event
|
||||||
'smarty' => '2.6.7',
|
'smarty' => '2.6.7',
|
||||||
'php' => '4.1.0'
|
'php' => '4.1.0'
|
||||||
));
|
));
|
||||||
$propbag->add('version', '3.58');
|
$propbag->add('version', '3.59');
|
||||||
$propbag->add('event_hooks', array(
|
$propbag->add('event_hooks', array(
|
||||||
'frontend_fetchentries' => true,
|
'frontend_fetchentries' => true,
|
||||||
'frontend_fetchentry' => true,
|
'frontend_fetchentry' => true,
|
||||||
|
@ -702,9 +702,9 @@ class serendipity_event_freetag extends serendipity_event
|
||||||
|
|
||||||
case 'external_plugin':
|
case 'external_plugin':
|
||||||
$uri_parts = explode('?', str_replace(array('&', '%FF'), array('&', '.'), $eventData));
|
$uri_parts = explode('?', str_replace(array('&', '%FF'), array('&', '.'), $eventData));
|
||||||
|
$taglist = serendipity_db_bool($this->get_config('taglist', false));
|
||||||
$param = $taglist ? explode('/', str_replace('/taglist','',$uri_parts[0])) : explode('/', $uri_parts[0]);
|
$param = $taglist ? explode('/', str_replace('/taglist','',$uri_parts[0])) : explode('/', $uri_parts[0]);
|
||||||
$plugincode = array_shift($param);
|
$plugincode = array_shift($param);
|
||||||
$taglist = serendipity_db_bool($this->get_config('taglist', false));
|
|
||||||
$tagged_as_list = false;
|
$tagged_as_list = false;
|
||||||
|
|
||||||
// By option or manually added blogdomain.com/plugin/taglist/Serendipity/Blog/Plums - see below
|
// By option or manually added blogdomain.com/plugin/taglist/Serendipity/Blog/Plums - see below
|
||||||
|
@ -980,9 +980,9 @@ addLoadEvent(enableAutocomplete);
|
||||||
}
|
}
|
||||||
// jQuery Migrate is used due to $.browser of autocomplete plugin not being available in jquery 1.9+
|
// jQuery Migrate is used due to $.browser of autocomplete plugin not being available in jquery 1.9+
|
||||||
echo '
|
echo '
|
||||||
' . ($serendipity['version'][0] < 2 ? '<script src="https://ajax.googleapis.com/ajax/libs/jquery/1/jquery.min.js" type="text/javascript"></script>' : '') . '
|
' . ($serendipity['version'][0] < 2 ? '<script src="' . $serendipity['baseURL'] . 'plugins/serendipity_event_freetag/jquery-1.11.1.min.js" type="text/javascript"></script>' : '') . '
|
||||||
<link rel="stylesheet" type="text/css" href="' . $serendipity['baseURL'] . 'plugins/serendipity_event_freetag/jquery.autocomplete.css" />
|
<link rel="stylesheet" type="text/css" href="' . $serendipity['baseURL'] . 'plugins/serendipity_event_freetag/jquery.autocomplete.css" />
|
||||||
<script src="https://code.jquery.com/jquery-migrate-1.1.1.js"></script>
|
<script src="' . $serendipity['baseURL'] . 'plugins/serendipity_event_freetag/jquery-migrate-1.2.1.min.js"></script>
|
||||||
<script type="text/javascript" src="' . $serendipity['baseURL'] . 'plugins/serendipity_event_freetag/jquery.autocomplete.min.js"></script>
|
<script type="text/javascript" src="' . $serendipity['baseURL'] . 'plugins/serendipity_event_freetag/jquery.autocomplete.min.js"></script>
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
var tags = [' . implode(',', $wicktags) . '];
|
var tags = [' . implode(',', $wicktags) . '];
|
||||||
|
@ -995,7 +995,7 @@ addLoadEvent(enableAutocomplete);
|
||||||
matchContains: "word",
|
matchContains: "word",
|
||||||
autoFill: false
|
autoFill: false
|
||||||
})};
|
})};
|
||||||
addLoadEvent(enableAutocomplete);
|
addLoadEvent(enableAutocomplete);
|
||||||
' : '') . '
|
' : '') . '
|
||||||
</script>';
|
</script>';
|
||||||
}
|
}
|
||||||
|
@ -1249,12 +1249,9 @@ addLoadEvent(enableAutocomplete);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
// This falls into the default case, which returns false... Is this supposed to happen?
|
|
||||||
// Is it a bug?
|
|
||||||
// Is it a feature?
|
|
||||||
$this->displayEntry($eventData, $addData);
|
$this->displayEntry($eventData, $addData);
|
||||||
return true;
|
return true;
|
||||||
break; // Ian: shouldn't it break here? See upper question.
|
break;
|
||||||
|
|
||||||
case 'xmlrpc_updertEntry':
|
case 'xmlrpc_updertEntry':
|
||||||
if (isset($eventData['id']) && isset($eventData['mt_keywords'])) {
|
if (isset($eventData['id']) && isset($eventData['mt_keywords'])) {
|
||||||
|
|
Loading…
Reference in a new issue