| Index: branches/REL1_15/phase3/includes/db/Database.php |
| — | — | @@ -2760,7 +2760,7 @@ |
| 2761 | 2761 | * Get the number of rows in a result object |
| 2762 | 2762 | */ |
| 2763 | 2763 | function numRows() { |
| 2764 | | - return $this->db->numRows( $this->result ); |
| | 2764 | + return $this->db->numRows( $this ); |
| 2765 | 2765 | } |
| 2766 | 2766 | |
| 2767 | 2767 | /** |
| — | — | @@ -2773,7 +2773,7 @@ |
| 2774 | 2774 | * @throws DBUnexpectedError Thrown if the database returns an error |
| 2775 | 2775 | */ |
| 2776 | 2776 | function fetchObject() { |
| 2777 | | - return $this->db->fetchObject( $this->result ); |
| | 2777 | + return $this->db->fetchObject( $this ); |
| 2778 | 2778 | } |
| 2779 | 2779 | |
| 2780 | 2780 | /** |
| — | — | @@ -2785,14 +2785,14 @@ |
| 2786 | 2786 | * @throws DBUnexpectedError Thrown if the database returns an error |
| 2787 | 2787 | */ |
| 2788 | 2788 | function fetchRow() { |
| 2789 | | - return $this->db->fetchRow( $this->result ); |
| | 2789 | + return $this->db->fetchRow( $this ); |
| 2790 | 2790 | } |
| 2791 | 2791 | |
| 2792 | 2792 | /** |
| 2793 | 2793 | * Free a result object |
| 2794 | 2794 | */ |
| 2795 | 2795 | function free() { |
| 2796 | | - $this->db->freeResult( $this->result ); |
| | 2796 | + $this->db->freeResult( $this ); |
| 2797 | 2797 | unset( $this->result ); |
| 2798 | 2798 | unset( $this->db ); |
| 2799 | 2799 | } |
| — | — | @@ -2802,7 +2802,7 @@ |
| 2803 | 2803 | * See mysql_data_seek() |
| 2804 | 2804 | */ |
| 2805 | 2805 | function seek( $row ) { |
| 2806 | | - $this->db->dataSeek( $this->result, $row ); |
| | 2806 | + $this->db->dataSeek( $this, $row ); |
| 2807 | 2807 | } |
| 2808 | 2808 | |
| 2809 | 2809 | /********************* |
| — | — | @@ -2813,7 +2813,7 @@ |
| 2814 | 2814 | |
| 2815 | 2815 | function rewind() { |
| 2816 | 2816 | if ($this->numRows()) { |
| 2817 | | - $this->db->dataSeek($this->result, 0); |
| | 2817 | + $this->db->dataSeek($this, 0); |
| 2818 | 2818 | } |
| 2819 | 2819 | $this->pos = 0; |
| 2820 | 2820 | $this->currentRow = null; |
| Property changes on: branches/REL1_15/phase3/includes/db |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 2821 | 2821 | - /trunk/phase3/includes/db:48836,48886,48892,48989,48992,49002,49051,49068,49086,49191-49192,49212,49682,49685,49730,49775,49954,49956,49999,50041,50054,50070,50132,50134,50169,50215,50218,50328,50473,50580 |
| /trunk/phase3/includes/specials/db:48993 |
| 2822 | 2822 | + /trunk/phase3/includes/db:48836,48886,48892,48989,48992,49002,49051,49068,49086,49191-49192,49212,49682,49685,49730,49775,49954,49956,49999,50041,50054,50070,50132,50134,50169,50215,50218,50328,50473,50580,50614 |
| /trunk/phase3/includes/specials/db:48993 |
| Index: branches/REL1_15/phase3/RELEASE-NOTES |
| — | — | @@ -298,6 +298,8 @@ |
| 299 | 299 | * (bug 16937) Fixed PostgreSQL installation on Windows, workaround for upstream |
| 300 | 300 | pg_version() bug. |
| 301 | 301 | * (bug 11451) Fix upgrade from MediaWiki 1.2 or earlier (imagelinks schema). |
| | 302 | +* Fixed SQLite indexes, installation and upgrade. Reintroduced it as an option |
| | 303 | + to the installer. |
| 302 | 304 | |
| 303 | 305 | == API changes in 1.15 == |
| 304 | 306 | * (bug 16858) Revamped list=deletedrevs to make listing deleted contributions |