diff options
Diffstat (limited to 'modules/core/lib')
| -rw-r--r-- | modules/core/lib/ModuleDefinition.php | 4 | ||||
| -rw-r--r-- | modules/core/lib/ModuleInstaller.php | 5 | ||||
| -rw-r--r-- | modules/core/lib/Storage/SQLPermanentStorage.php | 6 |
3 files changed, 2 insertions, 13 deletions
diff --git a/modules/core/lib/ModuleDefinition.php b/modules/core/lib/ModuleDefinition.php index 64106e6..f633096 100644 --- a/modules/core/lib/ModuleDefinition.php +++ b/modules/core/lib/ModuleDefinition.php @@ -110,9 +110,7 @@ class sspmod_core_ModuleDefinition { $remoteDef = self::load($this->def['definition'], 'remote'); $remoteVersion = $remoteDef->getVersion($branch); - - #echo ' Comparing versions local [' . $thisVersion . '] and remote [' . $remoteVersion . ']' . "\n"; - + return version_compare($remoteVersion, $thisVersion, '>'); } diff --git a/modules/core/lib/ModuleInstaller.php b/modules/core/lib/ModuleInstaller.php index a35cc3d..5dde6fe 100644 --- a/modules/core/lib/ModuleInstaller.php +++ b/modules/core/lib/ModuleInstaller.php @@ -20,11 +20,6 @@ class sspmod_core_ModuleInstaller { $access = $this->module->getAccess($branch); switch($access['type']) { - // case 'svn' : - // $this->requireInstalled(); - // $this->remove($access); - // break; - default: $this->requireInstalled(); $this->removeModuleDir($access); diff --git a/modules/core/lib/Storage/SQLPermanentStorage.php b/modules/core/lib/Storage/SQLPermanentStorage.php index 1496657..0a1a925 100644 --- a/modules/core/lib/Storage/SQLPermanentStorage.php +++ b/modules/core/lib/Storage/SQLPermanentStorage.php @@ -99,8 +99,6 @@ class sspmod_core_Storage_SQLPermanentStorage { "key2 = '" . sqlite_escape_string($key2) . "' AND " . "type = '" . sqlite_escape_string($type) . "'"; $results = $this->db->queryExec($query); - # echo $query; - # echo $this->db>changes; return $results; } @@ -109,9 +107,7 @@ class sspmod_core_Storage_SQLPermanentStorage { $condition = self::getCondition($type, $key1, $key2); $query = "SELECT * FROM data WHERE " . $condition; $results = $this->db->arrayQuery($query, SQLITE_ASSOC); - -# echo '<pre>type: ' . $type . ' key1:' . $key1 . ' ' . $query; print_r($results); exit; - + if (count($results) !== 1) return NULL; $res = $results[0]; |