aboutsummaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
Diffstat (limited to 'engine')
-rw-r--r--engine/lib/access.php9
-rw-r--r--engine/schema/mysql.sql4
2 files changed, 9 insertions, 4 deletions
diff --git a/engine/lib/access.php b/engine/lib/access.php
index 5e08f2f9c..e696f89d8 100644
--- a/engine/lib/access.php
+++ b/engine/lib/access.php
@@ -101,17 +101,20 @@
{
$sql = "";
+ if ($table_prefix)
+ $table_prefix = sanitise_string($table_prefix) . ".";
+
if (!is_privileged())
{
$access = get_access_list();
- if ($table_prefix)
- $table_prefix = sanitise_string($table_prefix) . ".";
-
$sql = " ({$table_prefix}access_id in {$access} or ({$table_prefix}access_id = 0 and {$table_prefix}owner_guid = {$_SESSION['id']}))";
}
else
$sql = " 1 ";
+
+ // Only return 'active' objects
+ $sql .= " and {$table_prefix}enabled='yes'";
return $sql;
}
diff --git a/engine/schema/mysql.sql b/engine/schema/mysql.sql
index 749ee5bcf..491c1e4c6 100644
--- a/engine/schema/mysql.sql
+++ b/engine/schema/mysql.sql
@@ -34,7 +34,9 @@ CREATE TABLE `prefix_entities` (
`access_id` int(11) NOT NULL,
`time_created` int(11) NOT NULL,
- `time_updated` int(11) NOT NULL,
+ `time_updated` int(11) NOT NULL,
+
+ `enabled` enum ('yes', 'no') NOT NULL default 'yes',
primary key (`guid`),
KEY `site_guid` (`site_guid`)