Merge "Allow adding Deleted log entries"

diff --combined includes/logging/LogEntry.php
index d893be5,dc63241..bebe3a9
--- 1/includes/logging/LogEntry.php
--- 2/includes/logging/LogEntry.php
+++ b/includes/logging/LogEntry.php
@@@ -407,7 -407,7 +407,7 @@@ class ManualLogEntry extends LogEntryBa
         * Declare arbitrary tag/value relations to this log entry.
         * These can be used to filter log entries later on.
         *
 -       * @param array $relations Map of (tag => (list of values))
 +       * @param array $relations Map of (tag => (list of values|value))
         * @since 1.22
         */
        public function setRelations( array $relations ) {
@@@ -504,6 -504,10 +504,10 @@@
                        'log_comment' => $comment,
                        'log_params' => serialize( (array)$this->getParameters() ),
                );
+               if ( isset( $this->deleted ) ) {
+                       $data['log_deleted'] = $this->deleted;
+               }
+ 
                $dbw->insert( 'logging', $data, __METHOD__ );
                $this->id = !is_null( $id ) ? $id : $dbw->insertId();
  
@@@ -512,11 -516,6 +516,11 @@@
                        if ( !strlen( $tag ) ) {
                                throw new MWException( "Got empty log search tag." );
                        }
 +
 +                      if ( !is_array( $values ) ) {
 +                              $values = array( $values );
 +                      }
 +
                        foreach ( $values as $value ) {
                                $rows[] = array(
                                        'ls_field' => $tag,