diff --git a/CHANGELOG b/CHANGELOG index c21dc7e1d..9d469f608 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1912,7 +1912,7 @@ Version 3.4.3 (2015-12-22) Fix rapid repeated requests to GNUSocial instance (issue #2038) (annando) Fix install routine css when mod_rewrite doesn't works (issue #2071) (fabrixxm) Fix code to be compliant with minimum required PHP version (issue #2066) (fabrixxm, rabuzarus) - Fix feedback after succesfull registration (issue #2060) (annando) + Fix feedback after successful registration (issue #2060) (annando) Fix mention completion popup with TinyMCE (issue #1920) (fabrixxm) Fix photo cache and proxy when installed in subfolder (ddorian1) Fix bbcode conversion of the about text for the profile (issue #1607) (annando) diff --git a/src/Database/DBA.php b/src/Database/DBA.php index e29cd3038..d609f108e 100644 --- a/src/Database/DBA.php +++ b/src/Database/DBA.php @@ -205,7 +205,7 @@ class DBA * Please use DBA::delete, DBA::insert, DBA::update, ... instead * * @param string $sql SQL statement - * @return boolean Was the query successfull? False is returned only if an error occurred + * @return boolean Was the query successful? False is returned only if an error occurred * @throws \Exception */ public static function e(string $sql): bool @@ -420,7 +420,7 @@ class DBA * @param array|boolean $old_fields array with the old field values that are about to be replaced (true = update on duplicate, false = don't update identical fields) * @param array $params Parameters: "ignore" If set to "true" then the update is done with the ignore parameter * - * @return boolean was the update successfull? + * @return boolean was the update successful? * @throws \Exception */ public static function update(string $table, array $fields, array $condition, $old_fields = [], array $params = []): bool diff --git a/src/Database/Database.php b/src/Database/Database.php index 9527fefb0..4ee0fc31d 100644 --- a/src/Database/Database.php +++ b/src/Database/Database.php @@ -767,7 +767,7 @@ class Database * * @param string $sql SQL statement * - * @return boolean Was the query successfull? False is returned only if an error occurred + * @return boolean Was the query successful? False is returned only if an error occurred * @throws \Exception */ public function e(string $sql): bool @@ -1321,7 +1321,7 @@ class Database * @param array|boolean $old_fields array with the old field values that are about to be replaced (true = update on duplicate, false = don't update identical fields) * @param array $params Parameters: "ignore" If set to "true" then the update is done with the ignore parameter * - * @return boolean was the update successfull? + * @return boolean was the update successful? * @throws \Exception * @todo Implement "bool $update_on_duplicate" to avoid mixed type for $old_fields */ diff --git a/src/Model/Contact.php b/src/Model/Contact.php index 649142c14..8792273ee 100644 --- a/src/Model/Contact.php +++ b/src/Model/Contact.php @@ -239,7 +239,7 @@ class Contact * @param array $condition condition array with the key values * @param array|boolean $old_fields array with the old field values that are about to be replaced (true = update on duplicate, false = don't update identical fields) * - * @return boolean was the update successfull? + * @return boolean was the update successful? * @throws \Exception * @todo Let's get rid of boolean type of $old_fields */ @@ -1686,7 +1686,7 @@ class Contact * Unblocks a contact * * @param int $cid Contact id to unblock - * @return bool Whether it was successfull + * @return bool Whether it was successful */ public static function unblock(int $cid): bool { diff --git a/src/Model/GServer.php b/src/Model/GServer.php index d9df8e205..b034ded75 100644 --- a/src/Model/GServer.php +++ b/src/Model/GServer.php @@ -327,7 +327,7 @@ class GServer return DateTimeFormat::utc('now +1 month'); } - // The system hadn't been successul contacted for more than a month, so try again in three months + // The system hadn't been successful contacted for more than a month, so try again in three months return DateTimeFormat::utc('now +3 month'); } diff --git a/src/Model/Photo.php b/src/Model/Photo.php index 81ea22746..2d80df15b 100644 --- a/src/Model/Photo.php +++ b/src/Model/Photo.php @@ -536,7 +536,7 @@ class Photo * @param Image $image Image to update. Optional, default null. * @param array $old_fields Array with the old field values that are about to be replaced (true = update on duplicate) * - * @return boolean Was the update successfull? + * @return boolean Was the update successful? * * @throws \Friendica\Network\HTTPException\InternalServerErrorException * @see \Friendica\Database\DBA::update diff --git a/src/Model/User.php b/src/Model/User.php index b184b1a4b..97853799a 100644 --- a/src/Model/User.php +++ b/src/Model/User.php @@ -1377,7 +1377,7 @@ class User * permanently against re-registration, as the person was not yet * allowed to have friends on this system * - * @return bool True, if the deny was successfull + * @return bool True, if the deny was successful * @throws Exception */ public static function deny(string $hash): bool