enwikipedia-acc / waca

oauth/OAuthUtility.php

Indentation +1 added lines, -1 removed lines

@@ -147,7 +147,7 @@
 	public function getIdentity($accessToken, $accessSecret)
 	{
 		
-        global $toolUserAgent;
+		global $toolUserAgent;
 
 		$endpoint = $this->baseUrlInternal . '/identify&format=json';
 

includes/DataObject.php

Indentation +4 added lines, -4 removed lines

@@ -19,9 +19,9 @@ 
 
 	protected $dbObject;
     
-    protected static $getByIdStatement = array();
+	protected static $getByIdStatement = array();
     
-    protected static $getByIdResults = array();
+	protected static $getByIdResults = array();
 
 	public function setDatabase(PdoDatabase $db)
 	{
@@ -45,7 +45,7 @@ 
 	public static function getById($id, PdoDatabase $database)
 	{
 		if( isset( self::$getByIdResults[strtolower(get_called_class())][$id] ) ) return self::$getByIdResults[strtolower(get_called_class())][$id];
-        if( !isset( self::$getByIdStatement[strtolower(get_called_class())] ) ) self::$getByIdStatement[strtolower(get_called_class())] = $database->prepare("SELECT * FROM `" . strtolower(get_called_class()) . "` WHERE id = :id LIMIT 1;");
+		if( !isset( self::$getByIdStatement[strtolower(get_called_class())] ) ) self::$getByIdStatement[strtolower(get_called_class())] = $database->prepare("SELECT * FROM `" . strtolower(get_called_class()) . "` WHERE id = :id LIMIT 1;");
 		self::$getByIdStatement[strtolower(get_called_class())]->bindValue(":id", $id);
 
 		self::$getByIdStatement[strtolower(get_called_class())]->execute();
@@ -55,7 +55,7 @@ 
 		if ($resultObject != false) {
 			$resultObject->isNew = false;
 			$resultObject->setDatabase($database);
-            self::$getByIdResults[strtolower(get_called_class())][$id] = $resultObject;
+			self::$getByIdResults[strtolower(get_called_class())][$id] = $resultObject;
 		}
 
 		return $resultObject;

Spacing +2 added lines, -2 removed lines

@@ -44,8 +44,8 @@
 	 */
 	public static function getById($id, PdoDatabase $database)
 	{
-		if( isset( self::$getByIdResults[strtolower(get_called_class())][$id] ) ) return self::$getByIdResults[strtolower(get_called_class())][$id];
-        if( !isset( self::$getByIdStatement[strtolower(get_called_class())] ) ) self::$getByIdStatement[strtolower(get_called_class())] = $database->prepare("SELECT * FROM `" . strtolower(get_called_class()) . "` WHERE id = :id LIMIT 1;");
+		if (isset(self::$getByIdResults[strtolower(get_called_class())][$id])) return self::$getByIdResults[strtolower(get_called_class())][$id];
+        if (!isset(self::$getByIdStatement[strtolower(get_called_class())])) self::$getByIdStatement[strtolower(get_called_class())] = $database->prepare("SELECT * FROM `" . strtolower(get_called_class()) . "` WHERE id = :id LIMIT 1;");
 		self::$getByIdStatement[strtolower(get_called_class())]->bindValue(":id", $id);
 
 		self::$getByIdStatement[strtolower(get_called_class())]->execute();

Braces +6 added lines, -2 removed lines

@@ -44,8 +44,12 @@
 	 */
 	public static function getById($id, PdoDatabase $database)
 	{
-		if( isset( self::$getByIdResults[strtolower(get_called_class())][$id] ) ) return self::$getByIdResults[strtolower(get_called_class())][$id];
-        if( !isset( self::$getByIdStatement[strtolower(get_called_class())] ) ) self::$getByIdStatement[strtolower(get_called_class())] = $database->prepare("SELECT * FROM `" . strtolower(get_called_class()) . "` WHERE id = :id LIMIT 1;");
+		if( isset( self::$getByIdResults[strtolower(get_called_class())][$id] ) ) {
+			return self::$getByIdResults[strtolower(get_called_class())][$id];
+		}
+        if( !isset( self::$getByIdStatement[strtolower(get_called_class())] ) ) {
+        	self::$getByIdStatement[strtolower(get_called_class())] = $database->prepare("SELECT * FROM `" . strtolower(get_called_class()) . "` WHERE id = :id LIMIT 1;");
+        }
 		self::$getByIdStatement[strtolower(get_called_class())]->bindValue(":id", $id);
 
 		self::$getByIdStatement[strtolower(get_called_class())]->execute();

includes/DataObjects/Request.php

Indentation +6 added lines, -6 removed lines

@@ -31,8 +31,8 @@ 
 
 	private $blacklistCache = null;
     
-    private static $commentsQuery = null;
-    private static $commentsResults = array();
+	private static $commentsQuery = null;
+	private static $commentsResults = array();
 
 	/**
 	 * This function removes all old requests which are not yet email-confirmed
@@ -260,10 +260,10 @@ 
 			return $this->hasComments;
 		}
         
-        if (isset(self::$commentsResults[$this->id])) {
-            $this->hasCommentsResolved = true;
-            return $this->hasComments = self::$commentsResults[$this->id];
-        }
+		if (isset(self::$commentsResults[$this->id])) {
+			$this->hasCommentsResolved = true;
+			return $this->hasComments = self::$commentsResults[$this->id];
+		}
 
 		if ($this->comment != "") {
 			$this->hasComments = true;

Braces +3 added lines, -1 removed lines

@@ -271,7 +271,9 @@
 			return true;
 		}
 
-		if (is_null(self::$commentsQuery)) self::$commentsQuery = $this->dbObject->prepare("SELECT COUNT(*) as num FROM comment where request = :id;");
+		if (is_null(self::$commentsQuery)) {
+			self::$commentsQuery = $this->dbObject->prepare("SELECT COUNT(*) as num FROM comment where request = :id;");
+		}
 		self::$commentsQuery->bindValue(":id", $this->id);
 
 		self::$commentsQuery->execute();