Changeset 1188

Timestamp:

02/20/10 10:08:04 (3 years ago)

Author:

nick_ramsay

Message:

[Branch 1.0] Hotaru version and upgrade updates.

Location:

branches/1.0

Files:

• Hotaru.php (modified) (1 diff)
• READ_ME.txt (modified) (1 diff)
• content/main_language.php (modified) (1 diff)
• install/upgrade.php (modified) (1 diff)

branches/1.0/Hotaru.php

@@ -26 +26 @@
 class Hotaru
 {
-    protected $version              = "1.0.5";  // Hotaru CMS version
+    protected $version              = "1.1";  // Hotaru CMS version
     protected $isDebug              = false;    // show db queries and page loading time
     protected $isAdmin              = false;    // flag to tell if we are in Admin or not

branches/1.0/READ_ME.txt

@@ -1 +1 @@
 HOTARU CMS
-Version: 1.0.5
-Released: Feb 1st 2010
+Version: 1.1
+Released: Feb 20th 2010
 
 INSTALLATION

branches/1.0/content/main_language.php

@@ -76 +76 @@
 /* Errors */
 $lang["main_theme_page_not_found"] = "Page not found";
-$lang['error_csrf'] = "Ah! You've triggered a CSRF error. That's only supposed to happen when someone tries hacking into the site...";
+$lang['error_csrf'] = "CSRF error. Please refresh the page and try again.";
 
 /* header */

branches/1.0/install/upgrade.php

@@ -339 +339 @@
     }
     
+    // 1.0.5 to 1.1
+    if ($old_version == "1.0.5") {
+        
+        // update "old version" for next set of upgrades
+        $old_version = "1.1";
+    }
+    
     // Update Hotaru version number to the database (referred to when upgrading)
     $sql = "UPDATE " . TABLE_MISCDATA . " SET miscdata_key = %s, miscdata_value = %s, miscdata_default = %s WHERE miscdata_key = %s";