From db9940b6054d8185d870b01238155379ee77f925 Mon Sep 17 00:00:00 2001 From: stronk7 Date: Sat, 18 Nov 2006 19:08:10 +0000 Subject: [PATCH] PHP generated code must use $result instead of $status. MDL-7533 Merged from MOODLE_17_STABLE --- .../view_structure_php.class.php | 6 ++-- .../view_table_php/view_table_php.class.php | 30 +++++++++---------- lib/xmldb/classes/XMLDBConstants.php | 2 +- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/admin/xmldb/actions/view_structure_php/view_structure_php.class.php b/admin/xmldb/actions/view_structure_php/view_structure_php.class.php index b23fa6dfbc8..49b1f100946 100644 --- a/admin/xmldb/actions/view_structure_php/view_structure_php.class.php +++ b/admin/xmldb/actions/view_structure_php/view_structure_php.class.php @@ -211,7 +211,7 @@ class view_structure_php extends XMLDBAction { /// Launch the proper DDL $result .= XMLDB_LINEFEED; $result .= ' /// Launch create table for ' . $table->getName() . XMLDB_LINEFEED; - $result .= ' $status = $status && create_table($table);' . XMLDB_LINEFEED; + $result .= ' $result = $result && create_table($table);' . XMLDB_LINEFEED; /// Add standard PHP footer $result .= XMLDB_PHP_FOOTER; @@ -249,7 +249,7 @@ class view_structure_php extends XMLDBAction { /// Launch the proper DDL $result .= XMLDB_LINEFEED; $result .= ' /// Launch drop table for ' . $table->getName() . XMLDB_LINEFEED; - $result .= ' $status = $status && drop_table($table);' . XMLDB_LINEFEED; + $result .= ' $result = $result && drop_table($table);' . XMLDB_LINEFEED; /// Add standard PHP footer $result .= XMLDB_PHP_FOOTER; @@ -287,7 +287,7 @@ class view_structure_php extends XMLDBAction { /// Launch the proper DDL $result .= XMLDB_LINEFEED; $result .= ' /// Launch rename table for ' . $table->getName() . XMLDB_LINEFEED; - $result .= ' $status = $status && rename_table($table, ' . "'NEWNAMEGOESHERE'" . ');' . XMLDB_LINEFEED; + $result .= ' $result = $result && rename_table($table, ' . "'NEWNAMEGOESHERE'" . ');' . XMLDB_LINEFEED; /// Add standard PHP footer $result .= XMLDB_PHP_FOOTER; diff --git a/admin/xmldb/actions/view_table_php/view_table_php.class.php b/admin/xmldb/actions/view_table_php/view_table_php.class.php index a3b7ca4584c..b31676176b2 100644 --- a/admin/xmldb/actions/view_table_php/view_table_php.class.php +++ b/admin/xmldb/actions/view_table_php/view_table_php.class.php @@ -336,7 +336,7 @@ class view_table_php extends XMLDBAction { /// Launch the proper DDL $result .= XMLDB_LINEFEED; $result .= ' /// Launch add field ' . $field->getName() . XMLDB_LINEFEED; - $result .= ' $status = $status && add_field($table, $field);' . XMLDB_LINEFEED; + $result .= ' $result = $result && add_field($table, $field);' . XMLDB_LINEFEED; /// Add standard PHP footer $result .= XMLDB_PHP_FOOTER; @@ -379,7 +379,7 @@ class view_table_php extends XMLDBAction { /// Launch the proper DDL $result .= XMLDB_LINEFEED; $result .= ' /// Launch drop field ' . $field->getName() . XMLDB_LINEFEED; - $result .= ' $status = $status && drop_field($table, $field);' . XMLDB_LINEFEED; + $result .= ' $result = $result && drop_field($table, $field);' . XMLDB_LINEFEED; /// Add standard PHP footer $result .= XMLDB_PHP_FOOTER; @@ -422,7 +422,7 @@ class view_table_php extends XMLDBAction { /// Launch the proper DDL $result .= XMLDB_LINEFEED; $result .= ' /// Launch rename field ' . $field->getName() . XMLDB_LINEFEED; - $result .= ' $status = $status && rename_field($table, $field, ' . "'" . 'NEWNAMEGOESHERE' . "'" . ');' . XMLDB_LINEFEED; + $result .= ' $result = $result && rename_field($table, $field, ' . "'" . 'NEWNAMEGOESHERE' . "'" . ');' . XMLDB_LINEFEED; /// Add standard PHP footer $result .= XMLDB_PHP_FOOTER; @@ -475,7 +475,7 @@ class view_table_php extends XMLDBAction { /// Launch the proper DDL $result .= XMLDB_LINEFEED; $result .= ' /// Launch change of type for field ' . $field->getName() . XMLDB_LINEFEED; - $result .= ' $status = $status && change_field_type($table, $field);' . XMLDB_LINEFEED; + $result .= ' $result = $result && change_field_type($table, $field);' . XMLDB_LINEFEED; /// Add standard PHP footer $result .= XMLDB_PHP_FOOTER; @@ -525,7 +525,7 @@ class view_table_php extends XMLDBAction { /// Launch the proper DDL $result .= XMLDB_LINEFEED; $result .= ' /// Launch change of precision for field ' . $field->getName() . XMLDB_LINEFEED; - $result .= ' $status = $status && change_field_precision($table, $field);' . XMLDB_LINEFEED; + $result .= ' $result = $result && change_field_precision($table, $field);' . XMLDB_LINEFEED; /// Add standard PHP footer $result .= XMLDB_PHP_FOOTER; @@ -571,7 +571,7 @@ class view_table_php extends XMLDBAction { /// Launch the proper DDL $result .= XMLDB_LINEFEED; $result .= ' /// Launch change of sign for field ' . $field->getName() . XMLDB_LINEFEED; - $result .= ' $status = $status && change_field_unsigned($table, $field);' . XMLDB_LINEFEED; + $result .= ' $result = $result && change_field_unsigned($table, $field);' . XMLDB_LINEFEED; /// Add standard PHP footer $result .= XMLDB_PHP_FOOTER; @@ -617,7 +617,7 @@ class view_table_php extends XMLDBAction { /// Launch the proper DDL $result .= XMLDB_LINEFEED; $result .= ' /// Launch change of nullability for field ' . $field->getName() . XMLDB_LINEFEED; - $result .= ' $status = $status && change_field_notnull($table, $field);' . XMLDB_LINEFEED; + $result .= ' $result = $result && change_field_notnull($table, $field);' . XMLDB_LINEFEED; /// Add standard PHP footer $result .= XMLDB_PHP_FOOTER; @@ -664,7 +664,7 @@ class view_table_php extends XMLDBAction { /// Launch the proper DDL $result .= XMLDB_LINEFEED; $result .= ' /// Launch change of list of values for field ' . $field->getName() . XMLDB_LINEFEED; - $result .= ' $status = $status && change_field_enum($table, $field);' . XMLDB_LINEFEED; + $result .= ' $result = $result && change_field_enum($table, $field);' . XMLDB_LINEFEED; /// Add standard PHP footer $result .= XMLDB_PHP_FOOTER; @@ -710,7 +710,7 @@ class view_table_php extends XMLDBAction { /// Launch the proper DDL $result .= XMLDB_LINEFEED; $result .= ' /// Launch change of default for field ' . $field->getName() . XMLDB_LINEFEED; - $result .= ' $status = $status && change_field_default($table, $field);' . XMLDB_LINEFEED; + $result .= ' $result = $result && change_field_default($table, $field);' . XMLDB_LINEFEED; /// Add standard PHP footer $result .= XMLDB_PHP_FOOTER; @@ -754,7 +754,7 @@ class view_table_php extends XMLDBAction { /// Launch the proper DDL $result .= XMLDB_LINEFEED; $result .= ' /// Launch add key ' . $key->getName() . XMLDB_LINEFEED; - $result .= ' $status = $status && add_key($table, $key);' . XMLDB_LINEFEED; + $result .= ' $result = $result && add_key($table, $key);' . XMLDB_LINEFEED; /// Add standard PHP footer $result .= XMLDB_PHP_FOOTER; @@ -798,7 +798,7 @@ class view_table_php extends XMLDBAction { /// Launch the proper DDL $result .= XMLDB_LINEFEED; $result .= ' /// Launch drop key ' . $key->getName() . XMLDB_LINEFEED; - $result .= ' $status = $status && drop_key($table, $key);' . XMLDB_LINEFEED; + $result .= ' $result = $result && drop_key($table, $key);' . XMLDB_LINEFEED; /// Add standard PHP footer $result .= XMLDB_PHP_FOOTER; @@ -845,7 +845,7 @@ class view_table_php extends XMLDBAction { /// Launch the proper DDL $result .= XMLDB_LINEFEED; $result .= ' /// Launch rename key ' . $key->getName() . XMLDB_LINEFEED; - $result .= ' $status = $status && rename_key($table, $key, ' . "'" . 'NEWNAMEGOESHERE' . "'" . ');' . XMLDB_LINEFEED; + $result .= ' $result = $result && rename_key($table, $key, ' . "'" . 'NEWNAMEGOESHERE' . "'" . ');' . XMLDB_LINEFEED; /// Add standard PHP footer $result .= XMLDB_PHP_FOOTER; @@ -889,7 +889,7 @@ class view_table_php extends XMLDBAction { /// Launch the proper DDL $result .= XMLDB_LINEFEED; $result .= ' /// Launch add index ' . $index->getName() . XMLDB_LINEFEED; - $result .= ' $status = $status && add_index($table, $index);' . XMLDB_LINEFEED; + $result .= ' $result = $result && add_index($table, $index);' . XMLDB_LINEFEED; /// Add standard PHP footer $result .= XMLDB_PHP_FOOTER; @@ -933,7 +933,7 @@ class view_table_php extends XMLDBAction { /// Launch the proper DDL $result .= XMLDB_LINEFEED; $result .= ' /// Launch drop index ' . $index->getName() . XMLDB_LINEFEED; - $result .= ' $status = $status && drop_index($table, $index);' . XMLDB_LINEFEED; + $result .= ' $result = $result && drop_index($table, $index);' . XMLDB_LINEFEED; /// Add standard PHP footer $result .= XMLDB_PHP_FOOTER; @@ -980,7 +980,7 @@ class view_table_php extends XMLDBAction { /// Launch the proper DDL $result .= XMLDB_LINEFEED; $result .= ' /// Launch rename index ' . $index->getName() . XMLDB_LINEFEED; - $result .= ' $status = $status && rename_index($table, $index, ' . "'" . 'NEWNAMEGOESHERE' . "'" . ');' . XMLDB_LINEFEED; + $result .= ' $result = $result && rename_index($table, $index, ' . "'" . 'NEWNAMEGOESHERE' . "'" . ');' . XMLDB_LINEFEED; /// Add standard PHP footer $result .= XMLDB_PHP_FOOTER; diff --git a/lib/xmldb/classes/XMLDBConstants.php b/lib/xmldb/classes/XMLDBConstants.php index 85ac444a7db..a6e8debb3ef 100644 --- a/lib/xmldb/classes/XMLDBConstants.php +++ b/lib/xmldb/classes/XMLDBConstants.php @@ -69,6 +69,6 @@ /// Some strings used widely define ('XMLDB_LINEFEED', "\n"); - define ('XMLDB_PHP_HEADER', ' if ($status && $oldversion < XXXXXXXXXX) {' . XMLDB_LINEFEED); + define ('XMLDB_PHP_HEADER', ' if ($result && $oldversion < XXXXXXXXXX) {' . XMLDB_LINEFEED); define ('XMLDB_PHP_FOOTER', ' }' . XMLDB_LINEFEED); ?>