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

actions/admin/settings/100.panel.php

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

lib/classes/database/class.Database.php

@@ -28,6 +28,11 @@
  * @author     Froxlor team <team@froxlor.org> (2010-)
  * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
  * @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 {
 

templates/Sparkle/ssl_certificates/certs_cert.tpl

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