Changeset 2304 for branches

Timestamp:

12/17/10 09:14:47 (17 months ago)

Author:

nick_ramsay

Message:

[1.5] Removed "messaging" table creation; Updated old comments in Messages class.

Location:

branches/1.5

Files:

• install/index.php (modified) (1 diff)
• install/install_tables.php (modified) (1 diff)
• libs/Messages.php (modified) (2 diffs)

branches/1.5/install/index.php

@@ -499 +499 @@
         } else {
 
-                $tables = array('blocked', 'categories', 'comments', 'messaging', 'miscdata', 'plugins', 'pluginhooks', 'pluginsettings', 'posts', 'postmeta', 'postvotes', 'settings', 'tags', 'tempdata', 'tokens', 'users', 'usermeta', 'useractivity', 'widgets');
+                $tables = array('blocked', 'categories', 'comments', 'miscdata', 'plugins', 'pluginhooks', 'pluginsettings', 'posts', 'postmeta', 'postvotes', 'settings', 'tags', 'tempdata', 'tokens', 'users', 'usermeta', 'useractivity', 'widgets');
 
                 // delete *all* tables in db:

branches/1.5/install/install_tables.php

@@ -112 +112 @@
                 $db->query($sql); 
         }
-                
-                
-        // MESSAGING TABLE
-        
-                if ($table_name == "messaging") {
-                //echo "table doesn't exist. Stopping before creation."; exit;
-                $sql = "CREATE TABLE `" . DB_PREFIX . $table_name . "` (
-                        `message_id` int(20) NOT NULL AUTO_INCREMENT PRIMARY KEY,
-                        `message_updatedts` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-                        `message_archived` enum('Y','N') NOT NULL DEFAULT 'N',
-                        `message_from` int(20) NOT NULL DEFAULT 0,
-                        `message_to` int(20) NOT NULL DEFAULT 0,
-                        `message_date` timestamp NULL,
-                        `message_subject` varchar(255) NOT NULL DEFAULT '',
-                        `message_content` text NULL,
-                        `message_read` tinyint(1) NOT NULL DEFAULT '0',
-                        `message_inbox` tinyint(1) NOT NULL DEFAULT '1',
-                        `message_outbox` tinyint(1) NOT NULL DEFAULT '1',
-                        `message_updateby` int(20) NOT NULL DEFAULT 0,
-                        INDEX  (`message_archived`)
-                ) ENGINE=" . DB_ENGINE . " DEFAULT CHARSET=" . DB_CHARSET . " COLLATE=" . DB_COLLATE . " COMMENT='Messaging';";
-                echo $lang['install_step2_creating_table'] . ": '" . DB_PREFIX . $table_name . "'...<br />\n";
-                $db->query($sql);
-                }
 
 

branches/1.5/libs/Messages.php

@@ -35 +35 @@
          *  Usage:
          *              Longhand:
-         *                      $this->hotaru->message = "This is a message";
-         *                      $this->hotaru->messageType = "green";
-         *                      $this->hotaru->showMessage();
+         *                      $h->message = "This is a message";
+         *                      $h->messageType = "green";
+         *                      $h->showMessage();
          *
          *              Shorthand:
-         *                      $this->hotaru->showMessage("This is a message", "green");
+         *                      $h->showMessage("This is a message", "green");
          */
         public function showMessage($h, $msg = '', $msg_type = 'green')
@@ -59 +59 @@
          *
          *  Usage:
-         *        $this->hotaru->messages['This is a message'] = "green";
-         *        $this->hotaru->showMessages();
+         *              $h->messages['This is a message'] = "green";
+         *              $h->showMessages();
          */
         public function showMessages($h)