aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kampmann <programmer@nurfuerspam.de>2012-04-09 14:27:52 +0200
committerAlexander Kampmann <programmer@nurfuerspam.de>2012-04-09 14:27:52 +0200
commit7187516718639fe93a9fb8fa78960bce85c7eaca (patch)
treecd7c129f17fd69088a612a4d685424aa5768fee7
parent7ac4b83c39d841c80c39ca034971aaaa4bdf0e59 (diff)
downloadvolse-hubzilla-7187516718639fe93a9fb8fa78960bce85c7eaca.tar.gz
volse-hubzilla-7187516718639fe93a9fb8fa78960bce85c7eaca.tar.bz2
volse-hubzilla-7187516718639fe93a9fb8fa78960bce85c7eaca.zip
fixed some typos
-rw-r--r--boot.php2
-rw-r--r--include/dba.php8
-rw-r--r--view/de/strings.php2
3 files changed, 6 insertions, 6 deletions
diff --git a/boot.php b/boot.php
index 56476be0b..eb2805f5f 100644
--- a/boot.php
+++ b/boot.php
@@ -672,7 +672,7 @@ if(! function_exists('check_config')) {
'$sitename' => $a->config['sitename'],
'$siteurl' => $a->get_baseurl(),
'$update' => $x,
- '$error' => $ex->getMessage());
+ '$error' => $ex->getMessage()));
$subject=sprintf(t('Update Error at %s'), $a->get_baseurl());
mail($a->config['admin_email'], $subject, $text,
diff --git a/include/dba.php b/include/dba.php
index 8a9d599c4..1421a703d 100644
--- a/include/dba.php
+++ b/include/dba.php
@@ -54,10 +54,10 @@ if(! class_exists('dba')) {
if(class_exists('mysqli')) {
$this->db = new mysqli($server,$user,$pass,$db);
- if(NULL === $this->db->connect_error()) {
+ if(NULL === $this->db->connect_error) {
$this->connected = true;
} else {
- throw new RuntimeException($this->db->connect_error());
+ throw new RuntimeException($this->db->connect_error);
}
} else {
$this->mysqli = false;
@@ -81,7 +81,7 @@ if(! class_exists('dba')) {
public function q($sql) {
if((! $this->db) || (! $this->connected)) {
- throwOrLog(new RuntimeException(t("There is no db connection. ")));
+ $this->throwOrLog(new RuntimeException(t("There is no db connection. ")));
return;
}
@@ -121,7 +121,7 @@ if(! class_exists('dba')) {
}
logger('dba: ' . $str );
if(FALSE===$result) {
- throwOrLog(new RuntimeException('dba: ' . $str));
+ $this->throwOrLog(new RuntimeException('dba: ' . $str));
return;
}
}
diff --git a/view/de/strings.php b/view/de/strings.php
index 5339d8a12..59c939ca0 100644
--- a/view/de/strings.php
+++ b/view/de/strings.php
@@ -777,7 +777,7 @@ $a->strings["{0} tagged %s's post with #%s"] = "{0} hat %ss Beitrag mit dem Schl
$a->strings["{0} mentioned you in a post"] = "{0} hat dich in einem Beitrag erwähnt";
$a->strings["OpenID protocol error. No ID returned."] = "OpenID Protokollfehler. Keine ID zurückgegeben.";
$a->strings["Account not found and OpenID registration is not permitted on this site."] = "Account wurde nicht gefunden und OpenID Registrierung auf diesem Server nicht gestattet.";
-$a->strings["Login failed."] = "Annmeldung fehlgeschlagen.";
+$a->strings["Login failed."] = "Anmeldung fehlgeschlagen.";
$a->strings["Connect URL missing."] = "Connect-URL fehlt";
$a->strings["This site is not configured to allow communications with other networks."] = "Diese Seite ist so konfiguriert, dass keine Kommunikation mit anderen Netzwerken erfolgen kann.";
$a->strings["No compatible communication protocols or feeds were discovered."] = "Es wurden keine kompatiblen Kommunikationsprotokolle oder Feeds gefunden.";