Skip to content

armgit / Vvveb

Public Imported from GitHub
0

Powerful and easy to use cms to build websites, blogs or ecommerce stores.

page check if page is assigned to site show page not found otherwise, fix for column not found for categories and tags subqueries

givanzcaad01a67ec3
diff --git a/admin/sql/mysqli/post.sql b/admin/sql/mysqli/post.sql
index 1d33909..221f313 100755
--- a/admin/sql/mysqli/post.sql
+++ b/admin/sql/mysqli/post.sql
@@ -66,11 +66,11 @@
INNER JOIN taxonomy_item_content td ON (taxonomies.taxonomy_item_id = td.taxonomy_item_id AND td.language_id = :language_id)
INNER JOIN taxonomy t ON (taxonomies.taxonomy_id = t.taxonomy_id)
- LEFT JOIN post_to_taxonomy_item pt ON (taxonomies.taxonomy_item_id = pt.taxonomy_item_id AND pt.post_id = posts.post_id)
+ LEFT JOIN post_to_taxonomy_item pt ON (taxonomies.taxonomy_item_id = pt.taxonomy_item_id)
WHERE
- td.language_id = :language_id AND t2s.site_id = :site_id AND pt.post_id = posts.post_id AND t.type = "categories"
+ td.language_id = :language_id AND t2s.site_id = :site_id AND pt.post_id = posts.post_id AND t.type = "categories" AND pt.post_id = posts.post_id
LIMIT :categories
@@ -88,11 +88,11 @@
INNER JOIN taxonomy_item_content td ON (taxonomies.taxonomy_item_id = td.taxonomy_item_id AND td.language_id = :language_id)
INNER JOIN taxonomy t ON (taxonomies.taxonomy_id = t.taxonomy_id)
- LEFT JOIN post_to_taxonomy_item pt ON (taxonomies.taxonomy_item_id = pt.taxonomy_item_id AND pt.post_id = posts.post_id)
+ LEFT JOIN post_to_taxonomy_item pt ON (taxonomies.taxonomy_item_id = pt.taxonomy_item_id)
WHERE
- td.language_id = :language_id AND t2s.site_id = :site_id AND pt.post_id = posts.post_id AND t.type = "tags"
+ td.language_id = :language_id AND t2s.site_id = :site_id AND pt.post_id = posts.post_id AND t.type = "tags" AND pt.post_id = posts.post_id
LIMIT :tags
@@ -110,11 +110,11 @@
INNER JOIN taxonomy_item_content td ON (taxonomies.taxonomy_item_id = td.taxonomy_item_id AND td.language_id = :language_id)
INNER JOIN taxonomy t ON (taxonomies.taxonomy_id = t.taxonomy_id)
- LEFT JOIN post_to_taxonomy_item pt ON (taxonomies.taxonomy_item_id = pt.taxonomy_item_id AND pt.post_id = posts.post_id)
+ LEFT JOIN post_to_taxonomy_item pt ON (taxonomies.taxonomy_item_id = pt.taxonomy_item_id)
WHERE
- td.language_id = :language_id AND t2s.site_id = :site_id AND pt.post_id = posts.post_id AND t.type = :taxonomy
+ td.language_id = :language_id AND t2s.site_id = :site_id AND pt.post_id = posts.post_id AND t.type = :taxonomy AND pt.post_id = posts.post_id
) as taxonomy
diff --git a/app/sql/mysqli/post.sql b/app/sql/mysqli/post.sql
index 3a191f9..3d42da7 100755
--- a/app/sql/mysqli/post.sql
+++ b/app/sql/mysqli/post.sql
@@ -69,7 +69,8 @@
CREATE PROCEDURE getContent(
IN post_id INT,
- IN slug CHAR,
+ IN site_id INT,
+ IN slug CHAR,
OUT fetch_all,
)
BEGIN
@@ -78,17 +79,28 @@
FROM post_content AS _
LEFT JOIN language ON (language.language_id = _.language_id)
LEFT JOIN post ON (post.post_id = _.post_id)
+
+ @IF isset(:site_id)
+ THEN
+ LEFT JOIN post_to_site pt ON (pt.post_id = _.post_id)
+ END @IF
+
WHERE 1 = 1
- @IF isset(:slug)
- THEN
- AND _.post_id = (SELECT post_id FROM post_content WHERE slug = :slug LIMIT 1)
- END @IF
+ @IF isset(:slug)
+ THEN
+ AND _.post_id = (SELECT post_id FROM post_content WHERE slug = :slug LIMIT 1)
+ END @IF
- @IF isset(:post_id)
- THEN
- AND _.post_id = :post_id
- END @IF
+ @IF isset(:post_id)
+ THEN
+ AND _.post_id = :post_id
+ END @IF
+
+ @IF isset(:site_id)
+ THEN
+ AND pt.site_id = :site_id
+ END @IF
END
-- Get categories
diff --git a/app/sql/pgsql/post.sql b/app/sql/pgsql/post.sql
index dde06f0..f3f95a0 100755
--- a/app/sql/pgsql/post.sql
+++ b/app/sql/pgsql/post.sql
@@ -69,7 +69,8 @@
CREATE PROCEDURE getContent(
IN post_id INT,
- IN slug CHAR,
+ IN site_id INT,
+ IN slug CHAR,
OUT fetch_all,
)
BEGIN
@@ -78,6 +79,12 @@
FROM post_content AS _
LEFT JOIN language ON (language.language_id = _.language_id)
LEFT JOIN post ON (post.post_id = _.post_id)
+
+ @IF isset(:site_id)
+ THEN
+ LEFT JOIN post_to_site pt ON (pt.post_id = _.post_id)
+ END @IF
+
WHERE 1 = 1
@IF isset(:slug)
@@ -89,6 +96,11 @@
THEN
AND _.post_id = :post_id
END @IF
+
+ @IF isset(:site_id)
+ THEN
+ AND pt.site_id = :site_id
+ END @IF
END
-- Get categories
diff --git a/app/sql/sqlite/post.sql b/app/sql/sqlite/post.sql
index c197af8..6b25250 100755
--- a/app/sql/sqlite/post.sql
+++ b/app/sql/sqlite/post.sql
@@ -69,7 +69,8 @@
CREATE PROCEDURE getContent(
IN post_id INT,
- IN slug CHAR,
+ IN site_id INT,
+ IN slug CHAR,
OUT fetch_all,
)
BEGIN
@@ -78,6 +79,12 @@
FROM post_content AS _
LEFT JOIN language ON (language.language_id = _.language_id)
LEFT JOIN post ON (post.post_id = _.post_id)
+
+ @IF isset(:site_id)
+ THEN
+ LEFT JOIN post_to_site pt ON (pt.post_id = _.post_id)
+ END @IF
+
WHERE 1 = 1
@IF isset(:slug)
@@ -89,6 +96,11 @@
THEN
AND _.post_id = :post_id
END @IF
+
+ @IF isset(:site_id)
+ THEN
+ AND pt.site_id = :site_id
+ END @IF
END
-- Get categories