Marc Delisle 836529be42 Fix merge conflicts

2013-07-28 05:55:40 -04:00

..

config_functions.lib.php

More coding style improvements

2012-05-07 23:14:25 +05:30

ConfigFile.class.php

Fix bug #3907 undefined variables, function parameter problems

2013-05-13 11:27:56 +02:00

Form.class.php

Prefix private instance variable with underscore

2012-05-16 21:59:28 +05:30

FormDisplay.class.php

Bug #3960 NavigationBarIconic config not honored

2013-06-21 10:00:41 -04:00

FormDisplay.tpl.php

Fix bug #3886 Documentation links broken in setup

2013-04-21 00:58:21 +05:30

messages.inc.php

Bug #3960 NavigationBarIconic config not honored

2013-06-21 10:00:41 -04:00

setup.forms.php

Bug #3960 NavigationBarIconic config not honored

2013-06-21 10:00:41 -04:00

user_preferences.forms.php

Bug #3960 NavigationBarIconic config not honored

2013-06-21 10:00:41 -04:00

validate.lib.php

[security] Fix self-XSS in setup, trusted proxies validation, see PMASA-2013-9

2013-07-07 17:11:16 +02:00