Gotta die today...

* Fix image uploading with image redirects enabled
* Escape titles

diff --git a/includes/filerepo/LocalFile.php b/includes/filerepo/LocalFile.php
index 105fb74..1a098ca 100644 (file)
--- a/includes/filerepo/LocalFile.php
+++ b/includes/filerepo/LocalFile.php
@@ -577,7 +577,7 @@ class LocalFile extends File
        function getHistory($limit = null, $start = null, $end = null) {
                $dbr = $this->repo->getSlaveDB();
                $conds = $opts = array();
-               $conds[] = "oi_name = '" . $this->title->getDBKey() . "'";
+               $conds[] = "oi_name = " . $dbr->addQuotes( $this->title->getDBKey() );
                if( $start !== null ) {
                        $conds[] = "oi_timestamp < '" . $dbr->timestamp( $start ) . "'";
                }

diff --git a/includes/filerepo/LocalRepo.php b/includes/filerepo/LocalRepo.php
index 8601881..a259bd4 100644 (file)
--- a/includes/filerepo/LocalRepo.php
+++ b/includes/filerepo/LocalRepo.php
@@ -90,7 +90,7 @@ class LocalRepo extends FSRepo {
                        return false;
                }
 
-               if( $title->getNamespace() == NS_MEDIA ) {
+               if( $title instanceof Title && $title->getNamespace() == NS_MEDIA ) {
                        $title = Title::makeTitle( NS_IMAGE, $title->getText() );
                }