mirror of
https://github.com/ZoneMinder/zoneminder.git
synced 2026-10-26 08:18:28 -04:00
Munge the config in the global configvals into the configs array before returning it.
This commit is contained in:
1 parent
a86b81d12e
commit
2a5f05499e
1 file changed
+12
-9
@@ -21,15 +21,18 @@ class ConfigsController extends AppController {
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function index() {
|
||||
$this->Config->recursive = 0;
|
||||
$configs = $this->Config->find('all');
|
||||
$this->set(array(
|
||||
'configs' => $configs,
|
||||
'_serialize' => array('configs')
|
||||
));
|
||||
}
|
||||
|
||||
public function index() {
|
||||
global $configvals;
|
||||
$this->Config->recursive = 0;
|
||||
$configs = $this->Config->find('all');
|
||||
foreach ( $configvals as $k=>$v ) {
|
||||
$configs[] = array( 'Config'=>array('Name'=>$k, 'Value'=>$v ) );
|
||||
}
|
||||
$this->set(array(
|
||||
'configs' => $configs,
|
||||
'_serialize' => array('configs')
|
||||
));
|
||||
}
|
||||
|
||||
/**
|
||||
* view method
|
||||
|
||||
Reference in new issue
Block a user