Removing old PO files, removing clutter

[koha_fer] / C4 / Context.pm

diff --git a/C4/Context.pm b/C4/Context.pm
index aac3206..e762aa5 100644 (file)
--- a/C4/Context.pm
+++ b/C4/Context.pm
@@ -106,6 +106,19 @@ use constant CONFIG_FNAME => "/etc/koha.xml";
 $context = undef;        # Initially, no context is set
 @context_stack = ();        # Initially, no saved contexts
 
+
+=item KOHAVERSION
+    returns the kohaversion stored in kohaversion.pl file
+=cut
+
+sub KOHAVERSION {
+    my $cgidir = C4::Context->intranetdir ."/cgi-bin";
+    unless (opendir(DIR, "$cgidir/cataloguing/value_builder")) {
+            $cgidir = C4::Context->intranetdir;
+    }
+    do $cgidir."/kohaversion.pl" || die "NO $cgidir/kohaversion.pl";
+    return kohaversion();
+}
 =item read_config_file
 
 =over 4
@@ -475,7 +488,6 @@ sub _new_Zconn {
     my $user = $context->{"serverinfo"}->{$server}->{"user"};
     my $servername = $context->{"config"}->{$server};
     my $password = $context->{"serverinfo"}->{$server}->{"password"};
-    warn "server:$server servername :$servername host:$host";
     retry:
     eval {
         # set options
@@ -544,7 +556,8 @@ sub _new_dbh
                 $db_user, $db_passwd);
     # Koha 3.0 is utf-8, so force utf8 communication between mySQL and koha, whatever the mysql default config.
     # this is better than modifying my.cnf (and forcing all communications to be in utf8)
-     $dbh->do("set NAMES 'utf8'") if ($dbh);
+    $dbh->do("set NAMES 'utf8'") if ($dbh);
+    $dbh->{'mysql_enable_utf8'}=1; #enable
     return $dbh;
 }
 
@@ -874,6 +887,20 @@ Joshua Ferraro <jmf at liblime dot com>
 =cut
 
 # $Log$
+# Revision 1.57  2007/05/22 09:13:55  tipaul
+# Bugfixes & improvements (various and minor) :
+# - updating templates to have tmpl_process3.pl running without any errors
+# - adding a drupal-like css for prog templates (with 3 small images)
+# - fixing some bugs in circulation & other scripts
+# - updating french translation
+# - fixing some typos in templates
+#
+# Revision 1.56  2007/04/23 15:21:17  tipaul
+# renaming currenttransfers to transferstoreceive
+#
+# Revision 1.55  2007/04/17 08:48:00  tipaul
+# circulation cleaning continued: bufixing
+#
 # Revision 1.54  2007/03/29 16:45:53  tipaul
 # Code cleaning of Biblio.pm (continued)
 #
@@ -940,7 +967,7 @@ Joshua Ferraro <jmf at liblime dot com>
 # In this commit, I created a "fake" user when insecure=ON. It has a fake branch. You may find better to have the 1st branch in branch table instead of a fake one.
 #
 # Revision 1.43.2.8  2006/12/19 16:48:16  alaurin
-# reident programs, and adding branchcode value in reserves2
+# reident programs, and adding branchcode value in reserves
 #
 # Revision 1.43.2.7  2006/12/06 21:55:38  hdl
 # Adding ModZebrations for servers to get serverinfos in Context.pm