fix typo, change version

osclass · Mar 23, 2015 · 983305c · 983305c
1 parent 4175a29
commit 983305c
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 8 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,3 +1,7 @@
+Osclass 3.5.5 2015-03-23
+------------------------
+- Fix typo on SQL query
+
 Osclass 3.5.4 2015-03-23
 ------------------------
 - Fixed two critical vulnerabilities thanks to Pedro Worcel ( http://www.security-assessment.com/ )

diff --git a/oc-content/themes/bender b/oc-content/themes/bender
diff --git a/oc-includes/osclass/controller/item.php b/oc-includes/osclass/controller/item.php
@@ -175,7 +175,7 @@ function doModel()
                 case 'item_edit':   // edit item
                                     $secret = Params::getParam('secret');
                                     $id     = Params::getParam('id');
-                                    $item   = $this->itemManager->listWhere("i.pk_i_id = '%d' AND ((i.s_secret = '%s' AND i.fk_i_user_id IS NULL) OR (i.fk_i_user_id = '%d'))", (int)($id), $secret, (int)($this->userId));
+                                    $item   = $this->itemManager->listWhere("i.pk_i_id = %d AND ((i.s_secret = %s AND i.fk_i_user_id IS NULL) OR (i.fk_i_user_id = %d))", (int)($id), $secret, (int)($this->userId));
                                     if (count($item) == 1) {
                                         $item     = Item::newInstance()->findByPrimaryKey($id);
 
@@ -204,7 +204,7 @@ function doModel()
 
                     $secret = Params::getParam('secret');
                     $id     = Params::getParam('id');
-                    $item   = $this->itemManager->listWhere("i.pk_i_id = '%d' AND ((i.s_secret = '%s' AND i.fk_i_user_id IS NULL) OR (i.fk_i_user_id = '%d'))", (int)($id), $secret, (int)($this->userId));
+                    $item   = $this->itemManager->listWhere("i.pk_i_id = %d AND ((i.s_secret = %s AND i.fk_i_user_id IS NULL) OR (i.fk_i_user_id = %d))", (int)($id), $secret, (int)($this->userId));
 
                     if (count($item) == 1) {
                         $this->_exportVariableToView('item', $item[0]);
@@ -248,7 +248,7 @@ function doModel()
                 case 'activate':
                     $secret = Params::getParam('secret');
                     $id     = Params::getParam('id');
-                    $item   = $this->itemManager->listWhere("i.pk_i_id = '%d' AND ((i.s_secret = '%s') OR (i.fk_i_user_id = '%d'))", (int)($id), $secret, (int)($this->userId));
+                    $item   = $this->itemManager->listWhere("i.pk_i_id = %d AND ((i.s_secret = %s) OR (i.fk_i_user_id = %d))", (int)($id), $secret, (int)($this->userId));
 
                     // item doesn't exist
                     if( count($item) == 0 ) {
@@ -276,7 +276,7 @@ function doModel()
                 case 'item_delete':
                     $secret = Params::getParam('secret');
                     $id     = Params::getParam('id');
-                    $item   = $this->itemManager->listWhere("i.pk_i_id = '%d' AND ((i.s_secret = '%s') OR (i.fk_i_user_id = '%d'))", (int)($id), $secret, (int)($this->userId));
+                    $item   = $this->itemManager->listWhere("i.pk_i_id = %d AND ((i.s_secret = %s) OR (i.fk_i_user_id = %d))", (int)($id), $secret, (int)($this->userId));
                     if (count($item) == 1) {
                         $mItems = new ItemActions(false);
                         $success = $mItems->delete($item[0]['s_secret'], $item[0]['pk_i_id']);

diff --git a/oc-includes/osclass/installer/basic_data.sql b/oc-includes/osclass/installer/basic_data.sql
@@ -4,7 +4,7 @@ INSERT INTO /*TABLE_PREFIX*/t_currency (pk_c_code, s_name, s_description, b_enab
     ('EUR', 'European Union euro', 'Euro €', true);
 
 INSERT INTO /*TABLE_PREFIX*/t_preference VALUES
-    ('osclass', 'version', 354, 'INTEGER')
+    ('osclass', 'version', 355, 'INTEGER')
     ,('osclass', 'theme', 'bender', 'STRING')
     ,('osclass', 'admin_language', 'en_US', 'STRING')
     ,('osclass', 'language', 'en_US', 'STRING')

diff --git a/oc-includes/osclass/upgrade-funcs.php b/oc-includes/osclass/upgrade-funcs.php
@@ -513,7 +513,7 @@
         osc_set_preference('marketURL', 'http://market.osclass.org/api/v2/');
     }
 
-    osc_changeVersionTo(354);
+    osc_changeVersionTo(355);
 
     if(!defined('IS_AJAX') || !IS_AJAX) {
         if(empty($aMessages)) {

diff --git a/oc-load.php b/oc-load.php
@@ -16,7 +16,7 @@
  */
 
 
-define('OSCLASS_VERSION', '3.5.4');
+define('OSCLASS_VERSION', '3.5.5');
 
 if( !defined('ABS_PATH') ) {
     define( 'ABS_PATH', str_replace('\\', '/', dirname(__FILE__) . '/' ));