Changeset 1818 for plugins/apostrophePlugin/branches/features/css/lib/model/doctrine/PluginaPageTable.class.php

Timestamp:

07/21/10 16:35:10 (22 months ago)

Author:

johnnyoffline

Message:

merged the latest changes in the trunk into my branch including any new CSS since revision 1717. The new CSS introduced was moved to the new locations in the split files. I am keeping this feature branch alive ladies and gents :)

Location:

plugins/apostrophePlugin/branches/features/css

Files:

• . (modified) (1 prop)
• lib/model/doctrine/PluginaPageTable.class.php (modified) (1 diff)

plugins/apostrophePlugin/branches/features/css/lib/model/doctrine/PluginaPageTable.class.php

@@ -530 +530 @@
         // The explicit case
     
+        // Explicit privileges on virtual pages are not permitted. We don't let admins set them anyway,
+        // you should be implementing them yourself with the 'edit' flag to a_area or a_slot, and if we
+        // use the DQL below to look at a page where 'lft' is NULL Doctrine drops that entire clause
+        // and the query matches everything, granting everybody with any editing privileges 
+        // the right to edit global slots
+        
+        // Sigh, I had this backwards
+        
+        if (!$pageOrInfo['lft'])
+        {
+          continue;
+        }
+        
         $user_id = $user->getGuardUser()->getId();