| 
                                                        @@ -4,40 +4,40 @@  | 
                                                    
                                                    
                                                         | 
                                                         | 
                                                         block discarded – undo  | 
                                                    
                                                                                                                                                                                                                    
                                                            | 
                                                                                                                                    4
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    4
                                                                                                                                                                                                 | 
                                                               | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    5
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    5
                                                                                                                                                                                                 | 
                                                             	'apc_enabled' => false,  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    6
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    6
                                                                                                                                                                                                 | 
                                                             	'apc_prefix' => 'laravel:',  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    7
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -	'extdir' => base_path('ext'), | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    7
                                                                                                                                                                                                 | 
                                                            +	'extdir' => base_path( 'ext' ),  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    8
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    8
                                                                                                                                                                                                 | 
                                                             	'pcntl_max' => 4,  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    9
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    9
                                                                                                                                                                                                 | 
                                                             	'pcntl_priority' => 19,  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    10
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    10
                                                                                                                                                                                                 | 
                                                             	'uploaddir' => '/',  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    11
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    11
                                                                                                                                                                                                 | 
                                                               | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    12
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    12
                                                                                                                                                                                                 | 
                                                             	'page' => array(  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    13
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -		'account-index' => array( 'account/profile','account/subscription','account/history','account/favorite','account/watch','basket/mini','catalog/session' ),  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    14
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -		'basket-index' => array( 'basket/mass', 'basket/standard','basket/related' ),  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    13
                                                                                                                                                                                                 | 
                                                            +		'account-index' => array( 'account/profile', 'account/subscription', 'account/history', 'account/favorite', 'account/watch', 'basket/mini', 'catalog/session' ),  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    14
                                                                                                                                                                                                 | 
                                                            +		'basket-index' => array( 'basket/mass', 'basket/standard', 'basket/related' ),  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    15
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    15
                                                                                                                                                                                                 | 
                                                             		'catalog-count' => array( 'catalog/count' ),  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    16
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -		'catalog-detail' => array( 'basket/mini','catalog/stage','catalog/detail','catalog/session' ),  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    17
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -		'catalog-list' => array( 'basket/mini','catalog/filter','catalog/lists' ),  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    16
                                                                                                                                                                                                 | 
                                                            +		'catalog-detail' => array( 'basket/mini', 'catalog/stage', 'catalog/detail', 'catalog/session' ),  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    17
                                                                                                                                                                                                 | 
                                                            +		'catalog-list' => array( 'basket/mini', 'catalog/filter', 'catalog/lists' ),  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    18
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    18
                                                                                                                                                                                                 | 
                                                             		'catalog-stock' => array( 'catalog/stock' ),  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    19
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    19
                                                                                                                                                                                                 | 
                                                             		'catalog-suggest' => array( 'catalog/suggest' ),  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    20
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -		'catalog-tree' => array( 'basket/mini','catalog/filter','catalog/stage','catalog/lists' ),  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    20
                                                                                                                                                                                                 | 
                                                            +		'catalog-tree' => array( 'basket/mini', 'catalog/filter', 'catalog/stage', 'catalog/lists' ),  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    21
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    21
                                                                                                                                                                                                 | 
                                                             		'checkout-confirm' => array( 'checkout/confirm' ),  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    22
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    22
                                                                                                                                                                                                 | 
                                                             		'checkout-index' => array( 'checkout/standard' ),  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    23
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -		'checkout-update' => array( 'checkout/update'),  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    23
                                                                                                                                                                                                 | 
                                                            +		'checkout-update' => array( 'checkout/update' ),  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    24
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    24
                                                                                                                                                                                                 | 
                                                             	),  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    25
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    25
                                                                                                                                                                                                 | 
                                                               | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    26
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    26
                                                                                                                                                                                                 | 
                                                             	'resource' => array(  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    27
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    27
                                                                                                                                                                                                 | 
                                                             		'db' => array(  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    28
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -			'adapter' => config('database.connections.mysql.driver', 'mysql'), | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    29
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -			'host' => config('database.connections.mysql.host', '127.0.0.1'), | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    30
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -			'port' => config('database.connections.mysql.port', '3306'), | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    31
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -			'socket' => config('database.connections.mysql.unix_socket', ''), | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    32
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -			'database' => config('database.connections.mysql.database', 'forge'), | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    33
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -			'username' => config('database.connections.mysql.username', 'forge'), | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    34
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -			'password' => config('database.connections.mysql.password', ''), | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    28
                                                                                                                                                                                                 | 
                                                            +			'adapter' => config( 'database.connections.mysql.driver', 'mysql' ),  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    29
                                                                                                                                                                                                 | 
                                                            +			'host' => config( 'database.connections.mysql.host', '127.0.0.1' ),  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    30
                                                                                                                                                                                                 | 
                                                            +			'port' => config( 'database.connections.mysql.port', '3306' ),  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    31
                                                                                                                                                                                                 | 
                                                            +			'socket' => config( 'database.connections.mysql.unix_socket', '' ),  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    32
                                                                                                                                                                                                 | 
                                                            +			'database' => config( 'database.connections.mysql.database', 'forge' ),  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    33
                                                                                                                                                                                                 | 
                                                            +			'username' => config( 'database.connections.mysql.username', 'forge' ),  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    34
                                                                                                                                                                                                 | 
                                                            +			'password' => config( 'database.connections.mysql.password', '' ),  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    35
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    35
                                                                                                                                                                                                 | 
                                                             			'stmt' => ["SET SESSION sort_buffer_size=2097144; SET NAMES 'utf8mb4'; SET SESSION sql_mode='ANSI'"],  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    36
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    36
                                                                                                                                                                                                 | 
                                                             			'opt-persistent' => 0,  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    37
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    37
                                                                                                                                                                                                 | 
                                                             			'limit' => 3,  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    38
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    38
                                                                                                                                                                                                 | 
                                                             			'defaultTableOptions' => [  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    39
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -				'charset' => config('database.connections.mysql.charset'), | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    40
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -				'collate' => config('database.connections.mysql.collation'), | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    39
                                                                                                                                                                                                 | 
                                                            +				'charset' => config( 'database.connections.mysql.charset' ),  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    40
                                                                                                                                                                                                 | 
                                                            +				'collate' => config( 'database.connections.mysql.collation' ),  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    41
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    41
                                                                                                                                                                                                 | 
                                                             			],  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    42
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    42
                                                                                                                                                                                                 | 
                                                             		),  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    43
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    43
                                                                                                                                                                                                 | 
                                                             		'fs' => array(  |