[Pkg-voip-commits] r3839 - in freepbx/trunk/debian: . patches
elcuco-guest at alioth.debian.org
elcuco-guest at alioth.debian.org
Thu Jul 26 06:32:25 UTC 2007
Author: elcuco-guest
Date: 2007-07-26 06:32:25 +0000 (Thu, 26 Jul 2007)
New Revision: 3839
Added:
freepbx/trunk/debian/patches/fix-trunks-sqlite3.dpatch
Modified:
freepbx/trunk/debian/changelog
freepbx/trunk/debian/patches/00list
Log:
more sqlite3 fixes - trunks was broken and now is fixed
Modified: freepbx/trunk/debian/changelog
===================================================================
--- freepbx/trunk/debian/changelog 2007-07-25 22:06:29 UTC (rev 3838)
+++ freepbx/trunk/debian/changelog 2007-07-26 06:32:25 UTC (rev 3839)
@@ -1,10 +1,11 @@
-freepbx (2.2.2~dfsg-1) UNRELEASED; urgency=low
+freepbx (2.2.2~dfsg-0) UNRELEASED; urgency=low
[ Diego Iastrubni ]
* New upstream release
* Removed obsolete patches
* System recordings are not saved in the sounds/custom directory
instead of /tmp/ (to be commited upstream "soon")
+ * Fixed trunks page, to work properly on SQLite3
[ Dermot Bradley ]
* Fixed fix-agibin-dir: log path was wrong
Modified: freepbx/trunk/debian/patches/00list
===================================================================
--- freepbx/trunk/debian/patches/00list 2007-07-25 22:06:29 UTC (rev 3838)
+++ freepbx/trunk/debian/patches/00list 2007-07-26 06:32:25 UTC (rev 3839)
@@ -1,6 +1,7 @@
# fix bugs
use-conf-defaults
fix-mysql-real-escape-string
+fix-trunks-sqlite3
# debian/xorcom enhancements
ast-config-dirs
Added: freepbx/trunk/debian/patches/fix-trunks-sqlite3.dpatch
===================================================================
--- freepbx/trunk/debian/patches/fix-trunks-sqlite3.dpatch (rev 0)
+++ freepbx/trunk/debian/patches/fix-trunks-sqlite3.dpatch 2007-07-26 06:32:25 UTC (rev 3839)
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix-trunks-sqlite3.dpatch by Diego Iastrubni <diego.iastrubni at xorcom.com>
+##
+## DP: Trunks page was not working when the sql engine was set to sqlite3, the reason is a malformed sql query
+
+ at DPATCH@
+diff -urNad upstream~/amp_conf/htdocs/admin/modules/core/functions.inc.php upstream/amp_conf/htdocs/admin/modules/core/functions.inc.php
+--- upstream~/amp_conf/htdocs/admin/modules/core/functions.inc.php 2007-06-08 03:42:50.000000000 +0300
++++ upstream/amp_conf/htdocs/admin/modules/core/functions.inc.php 2007-07-26 08:59:44.000000000 +0300
+@@ -1543,7 +1543,7 @@
+ // TODO: sqlite work arround - diego
+ // need to reorder the trunks in PHP code
+ // remember, in sqlite3 we need to use escape
+- $unique_trunks = sql("SELECT * FROM globals WHERE variable LIKE 'OUT_\\%' escape '\\' ORDER BY variable","getAll");
++ $unique_trunks = sql("SELECT * FROM globals WHERE variable LIKE 'OUT\\_%' escape '\\' ORDER BY variable","getAll");
+ }
+ else
+ {
Property changes on: freepbx/trunk/debian/patches/fix-trunks-sqlite3.dpatch
___________________________________________________________________
Name: svn:executable
+ *
More information about the Pkg-voip-commits
mailing list