maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

Merge remote-tracking branch 'origin/master' into 0.10.0

Browse Source
This commit is contained in:
Michael Kaufmann (d00p)
2018-03-12 10:23:53 +01:00
parent 81bd9d945d 349fa7a761
commit 66ebfaf21b
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
actions/admin/settings/100.panel.php
View File

@@ -71,7 +71,7 @@ return array(
'settinggroup' => 'panel', 'settinggroup' => 'panel',
'varname' => 'no_robots', 'varname' => 'no_robots',
'type' => 'bool', 'type' => 'bool',
'default' => false, 'default' => true,
'save_method' => 'storeSettingField', 'save_method' => 'storeSettingField',
), ),
'panel_paging' => array( 'panel_paging' => array(

5
lib/classes/database/class.Database.php
View File

@@ -28,6 +28,11 @@
* @author Froxlor team <team@froxlor.org> (2010-) * @author Froxlor team <team@froxlor.org> (2010-)
* @license GPLv2 http://files.froxlor.org/misc/COPYING.txt * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt
* @package Classes * @package Classes
*
* @method static \PDOStatement prepare($statement, array $driver_options = null) Prepares a statement for execution and returns a statement object
* @method static \PDOStatement query ($statement) Executes an SQL statement, returning a result set as a PDOStatement object
* @method static string lastInsertId ($name = null) Returns the ID of the last inserted row or sequence value
* @method static string quote ($string, $parameter_type = null) Quotes a string for use in a query.
*/ */
class Database { class Database {

2
templates/Sparkle/ssl_certificates/certs_cert.tpl vendored
View File

@@ -8,7 +8,7 @@
<if !empty($san_list)><br>SAN: {$san_list}</if> <if !empty($san_list)><br>SAN: {$san_list}</if>
</td> </td>
<td> <td>
{$cert_data['issuer']['O']} <if isset($cert_data['issuer']['O']) && !empty($cert_data['issuer']['O'])>{$cert_data['issuer']['O']}</if>
</td> </td>
<td> <td>
{$validFrom} {$validFrom}