php/LuckyCoinkydink
Archived
1
0
Fork 0
Code Issues Pull Requests Activity

language update by konus

Browse Source
This commit is contained in:
Garvin Hicking
2009-06-15 09:26:05 +00:00
parent 1924221ef6
commit 450ab08732
27 changed files with 390 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/serendipity_event_entryproperties/serendipity_event_entryproperties.php
+2 -2
View File
@@ -801,7 +801,7 @@ class serendipity_event_entryproperties extends serendipity_event
}
$conds = array();
if (!isset($addData['noSticky']) || $addData['noSticky'] !== true) {
if ((!isset($addData['noSticky']) || $addData['noSticky'] !== true) && !isset($serendipity['skipSticky'])) {
$conds[] = 'ep_sticky.value AS orderkey,';
} else {
$conds[] = 'e.isdraft AS orderkey,';
@@ -853,7 +853,7 @@ class serendipity_event_entryproperties extends serendipity_event
ON (e.id = ep_access_users.entryid AND ep_access_users.property = 'ep_access_users')";
}
if (!isset($addData['noSticky']) || $addData['noSticky'] !== true) {
if ((!isset($addData['noSticky']) || $addData['noSticky'] !== true) && !isset($serendipity['skipSticky'])) {
$joins[] = " LEFT JOIN {$serendipity['dbPrefix']}entryproperties ep_sticky
ON (e.id = ep_sticky.entryid AND ep_sticky.property = 'ep_is_sticky')";
}