tonyair/silverstripe-subsites
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-subsites synced 2024-10-22 11:05:55 +02:00
Code Issues Projects Releases Wiki Activity

BUGFIX: Rename Database to SS_Database, bug reintroduced post merge

Browse Source
This commit is contained in:
Luke Hudson 2010-03-03 03:09:13 +00:00
parent 9a4d52f754
commit 9583918d78
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/GroupSubsites.php
View File

@ -113,7 +113,7 @@ class GroupSubsites extends DataObjectDecorator implements PermissionProvider {
if(Subsite::$disable_subsite_filter) return;
if(Cookie::get('noSubsiteFilter') == 'true') return;
$q = defined('Database::USE_ANSI_SQL') ? "\"" : "`";
$q = defined('SS_Database::USE_ANSI_SQL') ? "\"" : "`";
// If you're querying by ID, ignore the sub-site - this is a bit ugly...
if(!$query->filtersOnID()) {
@ -214,4 +214,4 @@ class GroupSubsites extends DataObjectDecorator implements PermissionProvider {
}
?>
?>

2
code/Subsite.php
View File

@ -439,7 +439,7 @@ JS;
*/
function accessible_sites($permCode, $includeMainSite = false, $mainSiteTitle = "Main site", $member = null) {
// For 2.3 and 2.4 compatibility
$q = defined('Database::USE_ANSI_SQL') ? "\"" : "`";
$q = defined('SS_Database::USE_ANSI_SQL') ? "\"" : "`";
// Rationalise member arguments
if(!$member) $member = Member::currentUser();