Index: trunk/phase3/includes/api/ApiQueryLinks.php |
— | — | @@ -92,7 +92,7 @@ |
93 | 93 | "original value returned by the previous query", "_badcontinue"); |
94 | 94 | $plfrom = intval($cont[0]); |
95 | 95 | $plns = intval($cont[1]); |
96 | | - $pltitle = $this->getDb()->addQuotes($this->titleToKey($cont[2])); |
| 96 | + $pltitle = $this->getDb()->strencode($cont[2]); |
97 | 97 | $this->addWhere("{$this->prefix}_from > $plfrom OR ". |
98 | 98 | "({$this->prefix}_from = $plfrom AND ". |
99 | 99 | "({$this->prefix}_namespace > $plns OR ". |
— | — | @@ -128,8 +128,7 @@ |
129 | 129 | // We've reached the one extra which shows that |
130 | 130 | // there are additional pages to be had. Stop here... |
131 | 131 | $this->setContinueEnumParameter('continue', |
132 | | - "{$row->pl_from}|{$row->pl_namespace}|" . |
133 | | - $this->keyToTitle($row->pl_title)); |
| 132 | + "{$row->pl_from}|{$row->pl_namespace}|{$row->pl_title}"); |
134 | 133 | break; |
135 | 134 | } |
136 | 135 | if ($lastId != $row->pl_from) { |
— | — | @@ -158,8 +157,7 @@ |
159 | 158 | // We've reached the one extra which shows that |
160 | 159 | // there are additional pages to be had. Stop here... |
161 | 160 | $this->setContinueEnumParameter('continue', |
162 | | - "{$row->pl_from}|{$row->pl_namespace}|" . |
163 | | - $this->keyToTitle($row->pl_title)); |
| 161 | + "{$row->pl_from}|{$row->pl_namespace}|{$row->pl_title}"); |
164 | 162 | break; |
165 | 163 | } |
166 | 164 | $titles[] = Title :: makeTitle($row->pl_namespace, $row->pl_title); |
Index: trunk/phase3/includes/api/ApiQueryLangLinks.php |
— | — | @@ -58,7 +58,7 @@ |
59 | 59 | $this->dieUsage("Invalid continue param. You should pass the " . |
60 | 60 | "original value returned by the previous query", "_badcontinue"); |
61 | 61 | $llfrom = intval($cont[0]); |
62 | | - $lllang = $this->getDb()->addQuotes($cont[1]); |
| 62 | + $lllang = $this->getDb()->strencode($cont[1]); |
63 | 63 | $this->addWhere("ll_from > $llfrom OR ". |
64 | 64 | "(ll_from = $llfrom AND ". |
65 | 65 | "ll_lang >= '$lllang')"); |
Index: trunk/phase3/includes/api/ApiQueryCategories.php |
— | — | @@ -86,7 +86,7 @@ |
87 | 87 | $this->dieUsage("Invalid continue param. You should pass the " . |
88 | 88 | "original value returned by the previous query", "_badcontinue"); |
89 | 89 | $clfrom = intval($cont[0]); |
90 | | - $clto = $this->getDb()->addQuotes($this->titleToKey($cont[1])); |
| 90 | + $clto = $this->getDb()->strencode($cont[1]); |
91 | 91 | $this->addWhere("cl_from > $clfrom OR ". |
92 | 92 | "(cl_from = $clfrom AND ". |
93 | 93 | "cl_to >= '$clto')"); |
— | — | @@ -109,8 +109,7 @@ |
110 | 110 | if (++$count > $params['limit']) { |
111 | 111 | // We've reached the one extra which shows that |
112 | 112 | // there are additional pages to be had. Stop here... |
113 | | - $this->setContinueEnumParameter('continue', $row->cl_from . |
114 | | - '|' . $this->keyToTitle($row->cl_to)); |
| 113 | + $this->setContinueEnumParameter('continue', "{$row->cl_from}|{$row->cl_to}"); |
115 | 114 | break; |
116 | 115 | } |
117 | 116 | if ($lastId != $row->cl_from) { |
— | — | @@ -144,8 +143,7 @@ |
145 | 144 | if (++$count > $params['limit']) { |
146 | 145 | // We've reached the one extra which shows that |
147 | 146 | // there are additional pages to be had. Stop here... |
148 | | - $this->setContinueEnumParameter('continue', $row->cl_from . |
149 | | - '|' . $this->keyToTitle($row->cl_to)); |
| 147 | + $this->setContinueEnumParameter('continue', "{$row->il_from}|{$row->il_to}"); |
150 | 148 | break; |
151 | 149 | } |
152 | 150 | |
Index: trunk/phase3/includes/api/ApiQueryImages.php |
— | — | @@ -66,7 +66,7 @@ |
67 | 67 | $this->dieUsage("Invalid continue param. You should pass the " . |
68 | 68 | "original value returned by the previous query", "_badcontinue"); |
69 | 69 | $ilfrom = intval($cont[0]); |
70 | | - $ilto = $this->getDb()->addQuotes($this->titleToKey($cont[1])); |
| 70 | + $ilto = $this->getDb()->strencode($cont[1]); |
71 | 71 | $this->addWhere("il_from > $ilfrom OR ". |
72 | 72 | "(il_from = $ilfrom AND ". |
73 | 73 | "il_to >= '$ilto')"); |
— | — | @@ -90,8 +90,7 @@ |
91 | 91 | if (++$count > $params['limit']) { |
92 | 92 | // We've reached the one extra which shows that |
93 | 93 | // there are additional pages to be had. Stop here... |
94 | | - $this->setContinueEnumParameter('continue', $row->il_from . |
95 | | - '|' . $this->keyToTitle($row->il_to)); |
| 94 | + $this->setContinueEnumParameter('continue', "{$row->il_from}|{$row->il_to}"); |
96 | 95 | break; |
97 | 96 | } |
98 | 97 | if ($lastId != $row->il_from) { |
— | — | @@ -119,8 +118,7 @@ |
120 | 119 | if (++$count > $params['limit']) { |
121 | 120 | // We've reached the one extra which shows that |
122 | 121 | // there are additional pages to be had. Stop here... |
123 | | - $this->setContinueEnumParameter('continue', $row->il_from . |
124 | | - '|' . $this->keyToTitle($row->il_to)); |
| 122 | + $this->setContinueEnumParameter('continue', "{$row->il_from}|{$row->il_to}"); |
125 | 123 | break; |
126 | 124 | } |
127 | 125 | $titles[] = Title :: makeTitle(NS_IMAGE, $row->il_to); |