Changeset 2309 for branches

Timestamp:

12/18/10 10:30:19 (17 months ago)

Author:

nick_ramsay

Message:

[1.5] Replaced table constants for some plugin-created tables per test #202

Location:

branches/1.5

Files:

• install/install-upgrade.php (modified) (2 diffs)
• libs/Caching.php (modified) (3 diffs)
• libs/Comment.php (modified) (1 diff)
• libs/Initialize.php (modified) (3 diffs)

branches/1.5/install/install-upgrade.php

@@ -239 +239 @@
 
                 // get old cvote data
-                $sql = "SELECT * FROM " . TABLE_COMMENTVOTES;
+                $sql = "SELECT * FROM ".DB_PREFIX . "commentvotes";
                 $old_cvotes = $h->db->get_results($h->db->prepare($sql));
                 if ($old_cvotes) {
@@ -251 +251 @@
                 
                 // drop old commentvotes table
-                $h->db->query("DROP TABLE " . TABLE_COMMENTVOTES);
+                $h->db->query("DROP TABLE ".DB_PREFIX."commentvotes");
                 
                 // rename new table

branches/1.5/libs/Caching.php

@@ -207 +207 @@
                                 break;
                         case 'commentvotes':
-                                $sql = "SELECT cvote_updatedts FROM ".TABLE_COMMENTVOTES." ORDER BY cvote_updatedts DESC LIMIT 1";
+                                $sql = "SELECT cvote_updatedts FROM ".DB_PREFIX."commentvotes ORDER BY cvote_updatedts DESC LIMIT 1";
                                 break;
                         case 'users':
@@ -213 +213 @@
                                 break;
                         case 'useractivity':
-                                $sql = "SELECT useract_updatedts FROM ".TABLE_USERACTIVITY." ORDER BY useract_updatedts DESC LIMIT 1";
+                                $sql = "SELECT useract_updatedts FROM ".DB_PREFIX."useractivity ORDER BY useract_updatedts DESC LIMIT 1";
                                 break;
                         case 'usermeta':
@@ -225 +225 @@
                                 break;
                         case 'friends':
-                                $sql = "SELECT friends_updatedts FROM ".TABLE_FRIENDS." ORDER BY friends_updatedts DESC LIMIT 1";
+                                $sql = "SELECT friends_updatedts FROM ".DB_PREFIX."friends ORDER BY friends_updatedts DESC LIMIT 1";
                                 break;
                         default:

branches/1.5/libs/Comment.php

@@ -352 +352 @@
 
                 // delete any votes for this comment
-                $sql = "DELETE FROM ".TABLE_COMMENTVOTES." WHERE cvote_comment_id = %d";
+                $sql = "DELETE FROM ".DB_PREFIX."commentvotes WHERE cvote_comment_id = %d";
                 $h->db->query($h->db->prepare($sql, $this->id));
 

branches/1.5/libs/Initialize.php

@@ -115 +115 @@
                         'TABLE_CATEGORIES' => 'categories',
                         'TABLE_COMMENTS' => 'comments',
-                        'TABLE_FRIENDS' => 'friends',
-                        'TABLE_MESSAGING' => 'messaging',
                         'TABLE_MISCDATA' => 'miscdata',
                         'TABLE_PLUGINS' => 'plugins',
@@ -122 +120 @@
                         'TABLE_PLUGINSETTINGS' => 'pluginsettings',
                         'TABLE_POSTS' => 'posts',
-                        'TABLE_POSTMETA' => 'postmeta',
                         'TABLE_POSTVOTES' => 'postvotes',
                         'TABLE_SETTINGS' => 'settings',
@@ -129 +126 @@
                         'TABLE_USERS' => 'users',
                         'TABLE_USERMETA' => 'usermeta',
-                        'TABLE_USERACTIVITY' => 'useractivity',
                         'TABLE_WIDGETS' => 'widgets',
                         'TABLE_TOKENS' => 'tokens'