Fixed a bug with the revamped access collections

git-svn-id: https://code.elgg.org/elgg/trunk@1467 36083f99-b078-4883-b0ff-0f9b5a30f544

2 files changed, 3 insertions, 8 deletions

diff --git a/engine/lib/access.php b/engine/lib/access.php
index c04b7a9bc..7284ff54d 100644
--- a/engine/lib/access.php
+++ b/engine/lib/access.php
@@ -151,11 +151,12 @@
 				$query = "select ag.* from {$CONFIG->dbprefix}access_collections ag ";

 				$query .= " where (ag.site_guid = {$site_id} or ag.site_guid = 0)";

 				$query .= " and (ag.owner_guid = {$user_id} or ag.owner_guid = 0)";

+				$query .= " and ag.id > 3";

 				

-				$tmp_access_array = array();

+				$tmp_access_array = array(0 => elgg_echo("PRIVATE"), 1 => elgg_echo("LOGGED_IN"), 2 => elgg_echo("PUBLIC"));

 				if ($collections = get_data($query)) {

 					foreach($collections as $collection)

-						$tmp_access_array[$collection->id] = elgg_echo($collection->name);

+						$tmp_access_array[$collection->id] = $collection->name;

 				}

 				

 				$tmp_access_array = trigger_plugin_hook('access','user',array('user_id' => $user_id, 'site_id' => $site_id),$tmp_access_array);

diff --git a/engine/schema/mysql.sql b/engine/schema/mysql.sql
index 41410eef1..a93706c73 100644
--- a/engine/schema/mysql.sql
+++ b/engine/schema/mysql.sql
@@ -80,12 +80,6 @@ CREATE TABLE `prefix_access_collections` (
   KEY `name` (`name`)

 ) AUTO_INCREMENT=3;

 

--- Dumping data for table `access_collections`

-INSERT INTO `prefix_access_collections` (`id`, `name`, `site_guid`) VALUES

-(0, 'PRIVATE', 0),

-(1, 'LOGGED_IN', 0),

-(2, 'PUBLIC', 0);

-

 
 -- Access containers 

 CREATE TABLE `prefix_access_collection_membership` (