Project

General

Profile

« Previous | Next » 

Revision 1346

Added by Dietmar over 14 years ago

Ticket #999 wrong sql statement in admin/pages/index.php (Tks to Lucutus)

View differences:

branches/2.8.x/CHANGELOG
11 11
! = Update/Change
12 12

  
13 13
------------------------------------- 2.8.1 -------------------------------------
14
11-May-2010 Dietmar Woellbrink (Luisehahne)
14
12-May-2010 Dietmar Woellbrink (Luisehahne)
15
#	Ticket #999 wrong sql statement in admin/pages/index.php (Tks to Lucutus)
16
12-May-2010 Dietmar Woellbrink (Luisehahne)
15 17
-	remove unneeded flags in backend themes
16 18
-	remove admin/images
17 19
11-May-2010 Dietmar Woellbrink (Luisehahne)
branches/2.8.x/wb/admin/pages/index.php
36 36
	// $database = new database();
37 37

  
38 38
	// Get page list from database
39
    $sql = 'SELECT * FROM `'.TABLE_PREFIX.'pages` WHERE `parent` = '.$parent;
40
    $sql .= (PAGE_TRASH != 'inline') ?  ' AND `visibility` != "deleted"' : '';
41
    $sql .= ' ORDER BY `position` ASC';
39
    $sql = 'SELECT * FROM `'.TABLE_PREFIX.'pages` WHERE `parent` = '.$parent.' ';
40
    $sql .= (PAGE_TRASH != 'inline') ?  'AND `visibility` != \'deleted\' ' : ' ';
41
    $sql .= 'ORDER BY `position` ASC';
42 42
	$get_pages = $database->query($sql);
43 43
/*
44 44
	if(PAGE_TRASH != 'inline')
......
88 88
				}
89 89
			}
90 90
			// Work out if we should show a plus or not
91
            $sql = 'SELECT `page_id`,`admin_groups`,`admin_users` FROM `'.TABLE_PREFIX.'pages` WHERE `parent` = '.$page['page_id'];
92
            $sql .= (PAGE_TRASH != 'inline') ?  ' AND `visibility` != "deleted"' : '';
91
            $sql = 'SELECT `page_id`,`admin_groups`,`admin_users` FROM `'.TABLE_PREFIX.'pages` WHERE `parent` = '.$page['page_id'].' ';
92
            $sql .= (PAGE_TRASH != 'inline') ?  'AND `visibility` != \'deleted\' ' : ' ';
93 93
            // $sql .= ' ORDER BY `position` ASC';
94 94
        	$get_page_subs = $database->query($sql);
95 95
/*
......
193 193
				if(MANAGE_SECTIONS == 'enabled' && $admin->get_permission('pages_modify')==true && $can_modify==true)
194 194
                {
195 195

  
196
                    $sql = 'SELECT `publ_start`, `publ_end` FROM `'.TABLE_PREFIX.'sections`';
197
                    $sql .= ' WHERE `page_id` = '.$page['page_id'].' AND `module` != "menu_link"';
196
                    $sql = 'SELECT `publ_start`, `publ_end` FROM `'.TABLE_PREFIX.'sections` ';
197
                    $sql .= 'WHERE `page_id` = '.$page['page_id'].' AND `module` != \'menu_link\' ';
198 198
                    $query_sections = $database->query($sql);
199 199

  
200 200
					// $query_sections = $database->query("SELECT publ_start, publ_end FROM ".TABLE_PREFIX."sections WHERE page_id = '{$page['page_id']}' AND module != 'menu_link'");
branches/2.8.x/wb/admin/interface/version.php
52 52

  
53 53
// check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled)
54 54
if(!defined('VERSION')) define('VERSION', '2.8.x');
55
if(!defined('REVISION')) define('REVISION', '1345');
55
if(!defined('REVISION')) define('REVISION', '1346');
56 56

  
57 57
?>

Also available in: Unified diff