| Index: trunk/extensions/SemanticForms/includes/SF_Utils.inc |
| — | — | @@ -76,7 +76,7 @@ |
| 77 | 77 | <p style="position: absolute; left: 45%; top: 45%;"><img src="$sfgScriptPath/skins/loading.gif" /></p> |
| 78 | 78 | |
| 79 | 79 | END; |
| 80 | | - $form_body = ' ' . Xml::tags('input', array('type' => 'hidden', 'name' => 'wpTextbox1', 'id' => 'wpTextbox1', 'value' => $page_contents), null) . "\n"; |
| | 80 | + $form_body = ' ' . Xml::element('input', array('type' => 'hidden', 'name' => 'wpTextbox1', 'id' => 'wpTextbox1', 'value' => $page_contents), null) . "\n"; |
| 81 | 81 | $form_body .= ' ' . Xml::element('input', array('type' => 'hidden', 'name' => 'wpSummary', 'value' => $edit_summary), null) . "\n"; |
| 82 | 82 | $form_body .= ' ' . Xml::element('input', array('type' => 'hidden', 'name' => 'wpStarttime', 'value' => $start_time), null) . "\n"; |
| 83 | 83 | $form_body .= ' ' . Xml::element('input', array('type' => 'hidden', 'name' => 'wpEdittime', 'value' => $edit_time), null) . "\n"; |
| — | — | @@ -245,7 +245,6 @@ |
| 246 | 246 | global $sfgMaxAutocompleteValues; |
| 247 | 247 | |
| 248 | 248 | $db = wfGetDB( DB_SLAVE ); |
| 249 | | - $fname = "SFUtils::getAllPagesForCategory"; |
| 250 | 249 | $top_category = str_replace(' ', '_', $top_category); |
| 251 | 250 | $categories = array($top_category); |
| 252 | 251 | $checkcategories = array($top_category); |
| — | — | @@ -265,7 +264,7 @@ |
| 266 | 265 | array('categorylinks', 'page'), |
| 267 | 266 | array('page_title', 'page_namespace'), |
| 268 | 267 | array('cl_from = page_id', $conditions), |
| 269 | | - $fname, |
| | 268 | + __METHOD__, |
| 270 | 269 | 'SORT BY cl_sortkey'); |
| 271 | 270 | if ($res) { |
| 272 | 271 | while ($res && $row = $db->fetchRow($res)) { |
| — | — | @@ -340,7 +339,6 @@ |
| 341 | 340 | global $wgContLang; |
| 342 | 341 | $namespaces = $wgContLang->getNamespaces(); |
| 343 | 342 | $db = wfGetDB( DB_SLAVE ); |
| 344 | | - $fname = "SFUtils::getAllPagesForNamespace"; |
| 345 | 343 | $pages = array(); |
| 346 | 344 | foreach ($namespaces as $ns_code => $ns_name) { |
| 347 | 345 | if ($ns_name == $namespace_name) { |
| — | — | @@ -354,7 +352,7 @@ |
| 355 | 353 | $sql_options['ORDER BY'] = 'page_title'; |
| 356 | 354 | $res = $db->select( $db->tableNames('page'), |
| 357 | 355 | 'page_title', |
| 358 | | - $conditions, $fname, $sql_options); |
| | 356 | + $conditions, __METHOD__, $sql_options); |
| 359 | 357 | while ($row = $db->fetchRow($res)) { |
| 360 | 358 | $cur_value = str_replace('_', ' ', $row[0]); |
| 361 | 359 | if ($substring == null) { |