[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_3-3293-g9735acd

Marc Delisle lem9 at users.sourceforge.net
Fri May 14 19:38:56 CEST 2010


The branch, master has been updated
       via  9735acdda4bf0055bfc534bc0ed603ef9880a0d9 (commit)
      from  ccd8da050198688febbc47bf918845d333cef1e1 (commit)


- Log -----------------------------------------------------------------
commit 9735acdda4bf0055bfc534bc0ed603ef9880a0d9
Author: Marc Delisle <marc at infomarc.info>
Date:   Fri May 14 13:38:48 2010 -0400

    missing escape for quote

-----------------------------------------------------------------------

Summary of changes:
 import.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/import.php b/import.php
index 0fb559b..9498752 100644
--- a/import.php
+++ b/import.php
@@ -423,7 +423,7 @@ if (!empty($id_bookmark) && $action_bookmark == 2) {
 if ($timeout_passed) {
     $message = PMA_Message::error(__('Script timeout passed, if you want to finish import, please resubmit same file and import will resume.'));
     if ($offset == 0 || (isset($original_skip) && $original_skip == $offset)) {
-        $message->addString(__('However on last run no data has been parsed, this usually means phpMyAdmin won't be able to finish this import unless you increase php time limits.'));
+        $message->addString(__('However on last run no data has been parsed, this usually means phpMyAdmin won\'t be able to finish this import unless you increase php time limits.'));
     }
 }
 


hooks/post-receive
-- 
phpMyAdmin




More information about the Git mailing list