diff --git a/core/database.class.php b/core/database.class.php index f287d0b4..27ed0341 100644 --- a/core/database.class.php +++ b/core/database.class.php @@ -790,28 +790,28 @@ class MockDatabase extends Database { /** * @param string $query * @param array $args - * @return array|PDOStatement + * @return PDOStatement */ public function get_all($query, $args=array()) {return $this->execute($query, $args);} /** * @param string $query * @param array $args - * @return mixed|null|PDOStatement + * @return PDOStatement */ public function get_row($query, $args=array()) {return $this->execute($query, $args);} /** * @param string $query * @param array $args - * @return array|PDOStatement + * @return PDOStatement */ public function get_col($query, $args=array()) {return $this->execute($query, $args);} /** * @param string $query * @param array $args - * @return array|PDOStatement + * @return PDOStatement */ public function get_pairs($query, $args=array()) {return $this->execute($query, $args);} diff --git a/ext/ouroboros_api/main.php b/ext/ouroboros_api/main.php index 20d27294..8c8a5138 100644 --- a/ext/ouroboros_api/main.php +++ b/ext/ouroboros_api/main.php @@ -59,6 +59,11 @@ class _SafeOuroborosImage * @var integer */ public $width = null; + /** + * File extension + * @var string + */ + public $file_ext = ''; /** * File Size in bytes * @var integer @@ -189,7 +194,7 @@ class _SafeOuroborosImage * Constructor * @param Image $img */ - function __construct(Image $img) + public function __construct(Image $img) { global $config; // author @@ -343,7 +348,7 @@ class _SafeOuroborosTag public $name = ''; public $type = 0; - function __construct(array $tag) + public function __construct(array $tag) { $this->count = $tag['count']; $this->id = $tag['id']; diff --git a/themes/lite/layout.class.php b/themes/lite/layout.class.php index 6cef09e9..1728044f 100644 --- a/themes/lite/layout.class.php +++ b/themes/lite/layout.class.php @@ -164,7 +164,7 @@ class Layout { $flash = $page->get_cookie("flash_message"); $flash_html = ""; - if($flash) { + if(!empty($flash)) { $flash_html = "".nl2br(html_escape($flash))." [X]"; }