[php-blog-cvs] serendipity/include/admin plugins.inc.php,1.22,1.23 upgrader.inc.php,1.14,1.15

[Tom S. <tom...@us...>]

Update of /cvsroot/php-blog/serendipity/include/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14675/include/admin

Modified Files:
	plugins.inc.php upgrader.inc.php 
Log Message:
- serendipity_version is not used anymore, so don't hack it


Index: upgrader.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/upgrader.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- upgrader.inc.php	3 Feb 2005 18:55:19 -0000	1.14
+++ upgrader.inc.php	9 Feb 2005 19:55:21 -0000	1.15
@@ -134,7 +134,7 @@
 while (($file = readdir($dir)) !== false ) {
     if (preg_match('@db_update_(.*)_(.*)_(.*).sql@', $file, $res)) {
         list(, $verFrom, $verTo, $dbType) = $res;
-        if (version_compare($verFrom, serendipity_version($serendipity['versionInstalled'])) >= 0) {
+        if (version_compare($verFrom, $serendipity['versionInstalled']) >= 0) {
             $tmpFiles[$verFrom][$dbType] = $file;
         }
     }
@@ -175,7 +175,7 @@
 
     /* Call functions */
     foreach ($tasks as $task) {
-        if (version_compare(serendipity_version($serendipity['versionInstalled']), $task['version'], '<') ) {
+        if (version_compare($serendipity['versionInstalled'], $task['version'], '<') ) {
             if (is_callable($task['function'])) {
                 echo sprintf('Calling %s ...<br />', (is_array($task['function']) ? $task['function'][0] . '::'. $task['function'][1] : $task['function']));;
 
@@ -252,7 +252,7 @@
     $taskCount = 0;
 
     foreach ( $tasks as $task ) {
-        if (version_compare(serendipity_version($serendipity['versionInstalled']), $task['version'], '<'))  {
+        if (version_compare($serendipity['versionInstalled'], $task['version'], '<'))  {
             echo '<div><strong>'. $task['version'] .' - '. $task['title'] .'</strong></div>';
             echo '<div style="padding-left: 5px">'. nl2br($task['desc']) .'</div><br />';
             $taskCount++;

Index: plugins.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/plugins.inc.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- plugins.inc.php	9 Feb 2005 17:06:06 -0000	1.22
+++ plugins.inc.php	9 Feb 2005 19:55:20 -0000	1.23
@@ -574,16 +574,16 @@
         if (!isset($plug['customURI'])) {
             $plug['customURI'] = '';
         }
-        
-        if ( !empty($plug['requirements']['serendipity']) && version_compare($plug['requirements']['serendipity'], serendipity_version($serendipity['version'], true), '>') ) {
+
+        if ( !empty($plug['requirements']['serendipity']) && version_compare($plug['requirements']['serendipity'], serendipity_getCoreVersion($serendipity['version']), '>') ) {
             $notice['requirements_failures'][] = 's9y ' . $plug['requirements']['serendipity'];
         }
-        
+
         if ( !empty($plug['requirements']['serendipity']) && version_compare($plug['requirements']['php'], phpversion(), '>') ) {
             $notice['requirements_failures'][] = 'PHP ' . $plug['requirements']['php'];
         }
 
-        /* Enable after Smarty 2.6.7 upgrade. 
+        /* Enable after Smarty 2.6.7 upgrade.
          * TODO: How can we get current Smarty version here? $smarty is not created!
         if ( !empty($plug['requirements']['smarty']) && version_compare($plug['requirements']['smarty'], '2.6.7', '>') ) {
             $notice['requirements_failures'][] = 'Smarty: ' . $plug['requirements']['smarty'];