From: Joan M. <je...@us...> - 2003-08-08 08:16:36
|
Update of /cvsroot/gallery/gallery In directory sc8-pr-cvs1:/tmp/cvs-serv8940 Modified Files: util.php ChangeLog Version.php Log Message: 1.3.5-cvs-b106: Fixed bug in diagnositics so it will run without gettext defined. Index: util.php =================================================================== RCS file: /cvsroot/gallery/gallery/util.php,v retrieving revision 1.175 retrieving revision 1.176 diff -u -r1.175 -r1.176 --- util.php 8 Aug 2003 07:27:36 -0000 1.175 +++ util.php 8 Aug 2003 08:16:33 -0000 1.176 @@ -1878,15 +1878,17 @@ ** if yes, do some gettext settings. ** if not emulate _() function **/ - $check=(in_array("gettext", get_loaded_extensions()) && function_exists('gettext')); - if ($check) { - $bindtextdomain=bindtextdomain("gallery", $GALLERY_BASEDIR."locale"); - textdomain("gallery"); - } else { - emulate_gettext(); - } + emulate_gettext(); } function emulate_gettext() { + $check=(in_array("gettext", get_loaded_extensions()) && + function_exists('gettext')); + if ($check) { + $bindtextdomain=bindtextdomain("gallery", + $GALLERY_BASEDIR."locale"); + textdomain("gallery"); + return; + } global $translation; $filename=po_filename(); if ($filename) { @@ -1938,4 +1940,4 @@ return "Gallery"; } -?> \ No newline at end of file +?> Index: ChangeLog =================================================================== RCS file: /cvsroot/gallery/gallery/ChangeLog,v retrieving revision 1.456 retrieving revision 1.457 diff -u -r1.456 -r1.457 --- ChangeLog 8 Aug 2003 08:05:22 -0000 1.456 +++ ChangeLog 8 Aug 2003 08:16:33 -0000 1.457 @@ -1,3 +1,7 @@ +2003-08-08 Joan McGalliard <ga...@jo...> 1.3.5-cvs-b106 + + * Fixed bug in diagnositics so it will run without gettext defined. + 2003-08-08 Bharat Mediratta <bh...@me...> 1.3.5-cvs-b105 * Cleaned up warnings and minor errors in the setup diagnostics Index: Version.php =================================================================== RCS file: /cvsroot/gallery/gallery/Version.php,v retrieving revision 1.264 retrieving revision 1.265 diff -u -r1.264 -r1.265 --- Version.php 8 Aug 2003 08:05:22 -0000 1.264 +++ Version.php 8 Aug 2003 08:16:33 -0000 1.265 @@ -40,7 +40,7 @@ $gallery = new stdClass(); } -$gallery->version = "1.3.5-cvs-b105"; +$gallery->version = "1.3.5-cvs-b106"; $gallery->config_version = 41; $gallery->album_version = 13; $gallery->remote_protocol_version = 1; |