Removed 2nd parameter for assert() as this is only available in PHP 5.4.8+ but Mailer...

[mailer.git] / inc / extensions-functions.php

diff --git a/inc/extensions-functions.php b/inc/extensions-functions.php
index caf01774d27168f6bc077ae68acb7e40fc0b6da7..8dfde689bd230f9bc3be134c47b29850ef740518 100644 (file)
--- a/inc/extensions-functions.php
+++ b/inc/extensions-functions.php
@@ -1920,7 +1920,7 @@ function addDropTableSql ($tableName) {
 // Adds a RENAME TABLE stament if 'from' table exist and 'to' table not
 function addRenameTableSql ($fromTable, $toTable) {
        // Make sure both are not the same
-       assert($fromTable != $toTable, 'fromTable must be different to toTable (' . $fromTable . ')');
+       assert($fromTable != $toTable);
 
        // Is renaming required?
        if ((ifSqlTableExists($fromTable)) && (!ifSqlTableExists($toTable))) {
@@ -2060,8 +2060,8 @@ function addSponsorMenuSql ($action, $what, $title, $active, $sort) {
 // Add ALTER TABLE `foo` ADD sql if not found
 function addExtensionAddTableColumnSql ($tableName, $columnName, $columnSql) {
        // Assert on all
-       assert((!empty($tableName)) && (!empty($columnName)) && (!empty($columnSql)), 'tableName=' . $tableName . ',columnName=' . $columnName . ',columnSql=' . $columnSql);
-       assert($columnName != $columnSql . ',columnName=' . $columnName . ' must be non-equal to columnSql');
+       assert((!empty($tableName)) && (!empty($columnName)) && (!empty($columnSql)));
+       assert($columnName != $columnSql);
 
        // Is the column there?
        if (!ifSqlTableColumnExists('{?_MYSQL_PREFIX?}_' . $tableName, $columnName, isInstaller())) {
@@ -2079,8 +2079,8 @@ function addExtensionAddTableColumnSql ($tableName, $columnName, $columnSql) {
 // Add ALTER TABLE `foo` ADD INDEX sql if not found
 function addExtensionAddTableIndexSql ($tableName, $indexName, $columnSql) {
        // Assert on all
-       assert((!empty($tableName)) && (!empty($indexName)) && (!empty($columnSql)), 'tableName=' . $tableName . ',indexName=' . $indexName . ',columnSql=' . $columnSql);
-       assert(($indexName != $columnSql), 'indexName=' . $indexName  . ' must be unequal to columnSql');
+       assert((!empty($tableName)) && (!empty($indexName)) && (!empty($columnSql)));
+       assert($indexName != $columnSql);
 
        // Is the column there?
        if (!ifSqlTableIndexExist('{?_MYSQL_PREFIX?}_' . $tableName, $indexName, isInstaller())) {
@@ -2098,8 +2098,8 @@ function addExtensionAddTableIndexSql ($tableName, $indexName, $columnSql) {
 // Add ALTER TABLE `foo` ADD UNIQUE INDEX sql if not found
 function addExtensionAddTableUniqueSql ($tableName, $indexName, $columnSql) {
        // Assert on all
-       assert((!empty($tableName)) && (!empty($indexName)) && (!empty($columnSql)), 'tableName=' . $tableName . ',indexName=' . $indexName . ',columnSql=' . $columnSql);
-       assert($indexName != $columnSql, 'indexName=' . $indexName  . ' must be unequal to columnSql');
+       assert((!empty($tableName)) && (!empty($indexName)) && (!empty($columnSql)));
+       assert($indexName != $columnSql);
 
        // Is the column there?
        if (!ifSqlTableIndexExist('{?_MYSQL_PREFIX?}_' . $tableName, $indexName, isInstaller())) {
@@ -2117,8 +2117,8 @@ function addExtensionAddTableUniqueSql ($tableName, $indexName, $columnSql) {
 // Add ALTER TABLE `foo` ADD FULLTEXT sql if not found
 function addExtensionAddTableFulltextSql ($tableName, $indexName, $columnSql) {
        // Assert on all
-       assert((!empty($tableName)) && (!empty($indexName)) && (!empty($columnSql)), 'tableName=' . $tableName . ',indexName=' . $indexName . ',columnSql=' . $columnSql);
-       assert($indexName != $columnSql, 'indexName=' . $indexName  . ' must be unequal to columnSql');
+       assert((!empty($tableName)) && (!empty($indexName)) && (!empty($columnSql)));
+       assert($indexName != $columnSql);
 
        // Is the column there and MyISAM engine? (InnoDB doesn't support FULLTEXT)
        if ((getTableType() == 'MyISAM') && (!ifSqlTableIndexExist('{?_MYSQL_PREFIX?}_' . $tableName, $indexName, isInstaller()))) {
@@ -2136,8 +2136,8 @@ function addExtensionAddTableFulltextSql ($tableName, $indexName, $columnSql) {
 // Add ALTER TABLE `foo` CHANGE sql if not found
 function addExtensionChangeTableColumnSql ($tableName, $fromColumnName, $toColumnName, $columnSql) {
        // Assert on all
-       assert((!empty($tableName)) && (!empty($fromColumnName)) && (!empty($toColumnName)) && (!empty($columnSql)), 'tableName=' . $tableName . ',fromColumnName=' . $fromColumnName . ',toColumnName=' . $toColumnName . ',columnSql=' . $columnSql . ' must not be empty.');
-       assert(($fromColumnName != $columnSql) && ($toColumnName != $columnSql), 'tableName=' . $tableName . ',fromColumnName=' . $fromColumnName . ',toColumnName=' . $toColumnName . ',columnSql=' . $columnSql . ' must not be equal.');
+       assert((!empty($tableName)) && (!empty($fromColumnName)) && (!empty($toColumnName)) && (!empty($columnSql)));
+       assert(($fromColumnName != $columnSql) && ($toColumnName != $columnSql));
 
        // Is the column there?
        if ((ifSqlTableColumnExists('{?_MYSQL_PREFIX?}_' . $tableName, $fromColumnName)) && (($fromColumnName == $toColumnName) || (!ifSqlTableColumnExists('{?_MYSQL_PREFIX?}_' . $tableName, $toColumnName, isInstaller())))) {
@@ -2155,7 +2155,7 @@ function addExtensionChangeTableColumnSql ($tableName, $fromColumnName, $toColum
 // Add ALTER TABLE `foo` DROP sql if not found
 function addExtensionDropTableColumnSql ($tableName, $columnName) {
        // Assert on all
-       assert((!empty($tableName)) && (!empty($columnName)), 'tableName=' . $tableName . ',columnName=' . $columnName . ' must not be empty.');
+       assert((!empty($tableName)) && (!empty($columnName)));
 
        // Is the column there?
        if (ifSqlTableColumnExists('{?_MYSQL_PREFIX?}_' . $tableName, $columnName, isInstaller())) {
@@ -2173,7 +2173,7 @@ function addExtensionDropTableColumnSql ($tableName, $columnName) {
 // Add ALTER TABLE `foo` DROP INDEX sql if not found
 function addExtensionDropTableIndexSql ($tableName, $indexName) {
        // Assert on all
-       assert((!empty($tableName)) && (!empty($indexName)) . ',tableName=' . $tableName . ',indexName=' . $indexName . ' must not be empty.');
+       assert((!empty($tableName)) && (!empty($indexName)));
 
        // Is the column there?
        if (ifSqlTableColumnExists('{?_MYSQL_PREFIX?}_' . $tableName, $indexName, isInstaller())) {
@@ -2212,8 +2212,8 @@ function addConfigChangeSql ($oldColumnName, $newColumnName, $columnSql) {
  */
 function registerExtensionPointsData ($subject, $columnName, $lockedMode, $paymentMethod) {
        // Assert on all
-       assert((!empty($subject)) && (!empty($columnName)) && (!empty($lockedMode)) && (!empty($paymentMethod)), ',subject=' . $subject . ',columnName=' . $columnName . ',lockedMode=' . $lockedMode . ',paymentMethod=' . $paymentMethod . ' must not be empty.');
-       assert((in_array($lockedMode, array('LOCKED', 'UNLOCKED'))) && (in_array($paymentMethod, array('DIRECT', 'REFERRAL'))), ',subject=' . $subject . ',columnName=' . $columnName . ',lockedMode=' . $lockedMode . ',paymentMethod=' . $paymentMethod . ' must be valid.');
+       assert((!empty($subject)) && (!empty($columnName)) && (!empty($lockedMode)) && (!empty($paymentMethod)));
+       assert((in_array($lockedMode, array('LOCKED', 'UNLOCKED'))) && (in_array($paymentMethod, array('DIRECT', 'REFERRAL'))));
 
        // Is the suffix '_ref' not set?
        if (!ifSubjectHasReferralSuffix($subject)) {