Changeset 2512

Timestamp:

Sep 9, 2008, 3:16:32 AM (16 years ago)

Author:

rvelices

Message:

• fix issue when picture_url_style = file (sql query like)
• sql call SET NAMES "xxx" (if required) in upgrade.php, upgrade_feed.php and after 65-database.php

Location:

trunk

Files:

• install/db/65-database.php (modified) (1 diff)
• picture.php (modified) (1 diff)
• template/yoga/picture.tpl (modified) (1 diff)
• upgrade.php (modified) (1 diff)
• upgrade_feed.php (modified) (1 diff)

trunk/install/db/65-database.php

@@ -299 +299 @@
   define('DB_COLLATE',  '');
 
+  if ( version_compare(mysql_get_server_info(), '4.1.0', '>=') and DB_CHARSET!='' )
+  {
+    pwg_query('SET NAMES "'.DB_CHARSET.'"');
+  }
+
   echo $upgrade_log;
   $fp = @fopen( PHPWG_ROOT_PATH.'upgrade65.log', 'w' );

trunk/picture.php

@@ -53 +53 @@
   {// url given by file name
     assert( !empty($page['image_file']) );
-    $query .= 'file LIKE "' . $page['image_file'] . '.%" ESCAPE "|" LIMIT 1';
+    $query .= 'file LIKE "' .
+      str_replace(array('_','%'), array('/_','/%'), $page['image_file'] ).
+      '.%" ESCAPE "/" LIMIT 1';
   }
   if ( ! ( $row = mysql_fetch_array(pwg_query($query)) ) )

trunk/template/yoga/picture.tpl

@@ -210 +210 @@
                         {/if}
                         {/foreach}
-                        <script type="text/javascript" src="{$ROOT_URL}{$themeconf.template_dir}/rating.js"></script>
+                        <script type="text/javascript" src="{$ROOT_URL}template/{$themeconf.template}/rating.js"></script>
                         <script type="text/javascript">
                         makeNiceRatingForm( {ldelim}rootUrl: '{$ROOT_URL|@escape:"javascript"}', image_id: {$current.id},

trunk/upgrade.php

@@ -41 +41 @@
 
 // Database connection
-mysql_connect( $cfgHote, $cfgUser, $cfgPassword )
-or die ( "Could not connect to database server" );
-mysql_select_db( $cfgBase )
-or die ( "Could not connect to database" );
+mysql_connect( $cfgHote, $cfgUser, $cfgPassword ) or die ( "Could not connect to database server" );
+mysql_select_db( $cfgBase ) or die ( "Could not connect to database" );
+if ( version_compare(mysql_get_server_info(), '4.1.0', '>=')
+    and defined('DB_CHARSET') and DB_CHARSET!='' )
+{
+  pwg_query('SET NAMES "'.DB_CHARSET.'"');
+}
+
 // +-----------------------------------------------------------------------+
 // |                            tricky output                              |

trunk/upgrade_feed.php

@@ -43 +43 @@
 // +-----------------------------------------------------------------------+
 
-mysql_connect($cfgHote, $cfgUser, $cfgPassword)
-or die("Could not connect to database server");
-mysql_select_db($cfgBase)
-or die("Could not connect to database");
+mysql_connect($cfgHote, $cfgUser, $cfgPassword) or die("Could not connect to database server");
+mysql_select_db($cfgBase) or die("Could not connect to database");
+if ( version_compare(mysql_get_server_info(), '4.1.0', '>=')
+    and defined('DB_CHARSET') and DB_CHARSET!='' )
+{
+  pwg_query('SET NAMES "'.DB_CHARSET.'"');
+}
+
 
 // +-----------------------------------------------------------------------+